From 58a203b55e76111f330b86e2125d40d75dbebe9a Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 02 十一月 2023 10:21:13 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java |   12 +++++++-----
 1 files changed, 7 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 917800e..ede1550 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
@@ -17,12 +17,14 @@
     private String operatorType;
     /**鎿嶄綔浜烘爣璇�-蹇呭~*/
     private String operatorId;
-    /**鎿嶄綔浜鸿鑹叉爣璇�-闈炲繀濉�*/
-    private String roleId;
     /**鎿嶄綔浜哄悕绉�-蹇呭~*/
     private String operatorName;
 
-    /**鎿嶄綔澶囨敞*/
+    /**鎿嶄綔浜鸿鑹叉爣璇�-闈炲繀濉�*/
+    private String roleId;
+    /**鎿嶄綔浜哄钩鍙�-闈炲繀濉�*/
+    private String appIdCode;
+    /**鎿嶄綔澶囨敞-闈炲繀濉�*/
     private String operatorRemark;
 
     /**鏉ユ簮鏍囪瘑*/
@@ -32,7 +34,7 @@
     /**鏉ユ簮瀛愭爣璇�*/
     private String commonItemId;
 
-    /**鍙戦�佺殑鍒镐俊鎭�-蹇呭~*/
-    private List<CouponSendItemDto> couponList;
+    /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
+    private List<CouponSendUserDto> sendUserList;
 
 }

--
Gitblit v1.8.0