From c7b09c36a2b7082a57c776496b69b4173b4a1007 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 16 八月 2024 17:51:07 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 536b8a0..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 Integer operatorRemark;
+    /**鎿嶄綔浜鸿鑹叉爣璇�-闈炲繀濉�*/
+    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