From 2f2a95fb5b03338b84d8d92a61e9a3281c2495e6 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 05 九月 2023 17:09:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
index 6dfcd7b..c1cf034 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 浼樻儬鍒稿彂閫佸弬鏁�
  * @author fwq
@@ -15,8 +17,11 @@
     /**鍙戞斁鏁伴噺-蹇呭~*/
     private Integer num;
 
-    /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,涓嶅~榛樿涓�涓湀*/
+    /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String startTime;
-    /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,涓嶅~榛樿涓�涓湀*/
+    /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
+
+    /**鍙戦�佺殑鐢ㄦ埛-蹇呭~*/
+    private List<CouponSendUserDto> sendUserList;
 }

--
Gitblit v1.8.0