From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
index 8063011..4aa8246 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
@@ -5,7 +5,6 @@
import java.math.BigDecimal;
import java.util.List;
-import java.util.Map;
/**
* 浼樻儬鍒告柊澧炲弬鏁�
@@ -15,15 +14,19 @@
/**浼樻儬鍒告爣棰� */
private String title;
/**鐢宠绫诲瀷**/
- private Integer type;
- /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 绫诲瀷 0=閫氱敤 1=鎸囧畾 **/
+ private String type;
+ /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 绫诲瀷 0=鎸囧畾 1=閫氱敤 **/
private Integer useProjectType;
/**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 ID,name **/
- private List<Map<String,Object>> serviceIds;
+ private List<CouponProjectDto> serviceIds;
/**闂ㄥ簵ID*/
private String shopId;
/**绱鐢宠鏁伴噺*/
private Integer applyNum;
/**绱鐢宠閲戦*/
private BigDecimal applyAmount;
+ /**浼樻儬鍒告垚鏈儴闂ㄧ紪鍙� 鏍煎紡 ["CDT20230816WTAu"] */
+ private String costDepartmentCode;
+ /** 浼樻儬鍒告垚鏈儴闂� 澶氫釜*/
+ private List<Object> costDeptListArr;
}
--
Gitblit v1.8.0