From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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..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
@@ -18,15 +18,21 @@
     /**鎿嶄綔浜哄悕绉�-蹇呭~*/
     private String operatorName;
 
-    /**鎿嶄綔澶囨敞*/
+    /**鎿嶄綔浜鸿鑹叉爣璇�-闈炲繀濉�*/
+    private String roleId;
+    /**鎿嶄綔浜哄钩鍙�-闈炲繀濉�*/
+    private String appIdCode;
+    /**鎿嶄綔澶囨敞-闈炲繀濉�*/
     private String operatorRemark;
 
     /**鏉ユ簮鏍囪瘑*/
     private String commonId;
     /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
     private String commonType;
+    /**鏉ユ簮瀛愭爣璇�*/
+    private String commonItemId;
 
-    /**鍙戦�佺殑浼樻儬鍒歌鎯�-蹇呭~*/
-    private List<CouponSendUserDto> sendList;
+    /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
+    private List<CouponSendUserDto> sendUserList;
 
 }

--
Gitblit v1.8.0