From 541e9a5eb10f788f1f8067823fa6f71e1b52c31e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 14:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index a044af2..015c101 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -12,19 +12,26 @@
*/
@Data
public class CouponDto extends PageDto {
+ /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+ private String appIdCode;
/**鎿嶄綔浜烘爣璇�*/
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**娲诲姩鏍囪瘑*/
+ private String groupBuyId;
+ private String id;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
private List<UserArrDto> userArr;
- /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
- private String appIdCode;
+ private List<CouponItemDto> itemDtoList;
/**淇敼鏃堕棿*/
private String updateTime;
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
+
}
--
Gitblit v1.8.0