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 | 4 ++++ 1 files changed, 4 insertions(+), 0 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 db55fe3..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; @@ -29,6 +31,8 @@ private String commonId; /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/ private String commonType; + /**鏉ユ簮瀛愭爣璇�*/ + private String commonItemId; /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/ private List<CouponSendUserDto> sendUserList; -- Gitblit v1.8.0