From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' 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