From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 24580b3..6a6b5c5 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
@@ -29,8 +29,10 @@
     private String commonId;
     /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
     private String commonType;
+    /**鏉ユ簮瀛愭爣璇�*/
+    private String commonItemId;
 
-    /**鍙戦�佺殑鍒镐俊鎭�-蹇呭~*/
-    private List<CouponSendItemDto> couponList;
+    /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
+    private List<CouponSendUserDto> sendUserList;
 
 }

--
Gitblit v1.8.0