From 90fba4723f18cd5b8d23ec9cab857617ee6729b8 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 16 八月 2023 15:25:52 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
index ea6ead0..a0df617 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
@@ -26,7 +26,7 @@
     /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
     private String commonType;
 
-    /**鍙戦�佺殑浼樻儬鍒歌鎯�-蹇呭~*/
-    private List<CouponSendUserDto> sendList;
+    /**鍙戦�佺殑鍒镐俊鎭�-蹇呭~*/
+    private List<CouponSendItemDto> couponList;
 
 }
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