From e7d554f4f8f79eafaa2de3abe036d21e300fd14a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java | 3 ++-
phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java | 4 ++++
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
index efd6d47..c86d196 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto.promotion;
+import com.hz.his.dto.PageDto;
import lombok.Data;
/**
@@ -7,7 +8,7 @@
* @author fwq
* */
@Data
-public class PromotionDto {
+public class PromotionDto extends PageDto {
/**鏇存柊鏃堕棿*/
private String editTime;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
index 7de6199..1c606f3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
@@ -52,4 +52,11 @@
*/
@PostMapping(value = "/cardItem/update/list")
Result getUpdateCardItem(@RequestBody CardDto cardDto);
+
+ /**
+ * 鑾峰彇鏆傚仠鍜岀粨鏉熼攢鍞殑鍗￠」
+ * @return Result
+ */
+ @PostMapping(value = "/cardItem/noUp/list")
+ Result noUpList(@RequestBody CardDto cardDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
index 1fa3065..157c675 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
@@ -41,4 +41,8 @@
/**鑾峰彇淇冮攢鏇存柊鍒楄〃*/
@PostMapping(value = "/promotion/update/list")
Result getUpdatePromotion(@RequestBody PromotionDto promotionDto);
+
+ /**鑾峰彇鏆傚仠鍜岀粨鏉熼攢鍞殑淇冮攢*/
+ @PostMapping(value = "/promotion/noUp/list")
+ Result noUpList(@RequestBody PromotionDto promotionDto);
}
\ No newline at end of file
--
Gitblit v1.8.0