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 |    4 ++--
 1 files changed, 2 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 62b5ecf..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
@@ -22,6 +22,6 @@
     /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
 
-    /**鍙戦�佺殑鍒镐俊鎭�*/
-    private List<CouponSendItemDto> couponList;
+    /**鍙戦�佺殑鐢ㄦ埛-蹇呭~*/
+    private List<CouponSendUserDto> sendUserList;
 }

--
Gitblit v1.8.0