From b99a9da5e9d943ea1b6e5578501a11dc19fae553 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 10 十月 2023 17:32:58 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java | 14 +++++++++++---
1 files changed, 11 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..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;
@@ -18,15 +20,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