From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-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 37e1948..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
@@ -1,5 +1,7 @@
package com.hz.his.dto.coupon;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.util.List;
@@ -15,20 +17,24 @@
private String operatorType;
/**鎿嶄綔浜烘爣璇�-蹇呭～*/
private String operatorId;
- /**鎿嶄綔浜鸿鑹叉爣璇�-闈炲繀濉�*/
- private String roleId;
/**鎿嶄綔浜哄悕绉�-蹇呭～*/
private String operatorName;
- /**鎿嶄綔澶囨敞*/
+ /**鎿嶄綔浜鸿鑹叉爣璇�-闈炲繀濉�*/
+ private String roleId;
+ /**鎿嶄綔浜哄钩鍙�-闈炲繀濉�*/
+ private String appIdCode;
+ /**鎿嶄綔澶囨敞-闈炲繀濉�*/
private String operatorRemark;
/**鏉ユ簮鏍囪瘑*/
private String commonId;
/**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
private String commonType;
+ /**鏉ユ簮瀛愭爣璇�*/
+ private String commonItemId;
- /**鍙戦�佺殑鍒镐俊鎭�-蹇呭～*/
- private List<CouponSendItemDto> couponList;
+ /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
+ private List<CouponSendUserDto> sendUserList;
}
--
Gitblit v1.8.0