From a8251744709de9e3ca4063985a67e52b02078343 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 14 六月 2024 14:55:03 +0800
Subject: [PATCH] Merge branch 'fhx-prod-电子签0612' into master-test
---
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