From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 24580b3..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,8 +31,10 @@
private String commonId;
/**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
private String commonType;
+ /**鏉ユ簮瀛愭爣璇�*/
+ private String commonItemId;
- /**鍙戦�佺殑鍒镐俊鎭�-蹇呭～*/
- private List<CouponSendItemDto> couponList;
+ /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
+ private List<CouponSendUserDto> sendUserList;
}
--
Gitblit v1.8.0