From 3af1fe6b30e2c06fc696535ec900200e46631261 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期五, 02 十二月 2022 10:36:52 +0800
Subject: [PATCH] Merge branch '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