From e8bba077c22ca0507b21d463dc9ec2ac922835de Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 22 十一月 2023 17:22:00 +0800
Subject: [PATCH] Merge branch 'rx-1116-营销生日券' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java |    6 ++----
 1 files changed, 2 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 50eccc8..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,8 +5,6 @@
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 浼樻儬鍒告柊澧炲弬鏁�
@@ -16,11 +14,11 @@
     /**浼樻儬鍒告爣棰� */
     private String title;
     /**鐢宠绫诲瀷**/
-    private Integer type;
+    private String type;
     /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 绫诲瀷 0=鎸囧畾 1=閫氱敤 **/
     private Integer useProjectType;
     /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 ID,name **/
-    private List<Map<String,Object>> serviceIds;
+    private List<CouponProjectDto> serviceIds;
     /**闂ㄥ簵ID*/
     private String shopId;
     /**绱鐢宠鏁伴噺*/

--
Gitblit v1.8.0