From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 15 +++++++++++++--
1 files changed, 13 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..b3ea858 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,30 @@
*/
@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;
+ /**鍙戞斁浼樻儬鍒稿弬鏁�-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /*鐢ㄦ埛浼樻儬鍒�*/
+ private String couponNumberId;
+
}
--
Gitblit v1.8.0