From 8b72bd6ea00340d0f0c22b2f6f3ed315c74a2203 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 08 十一月 2022 15:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 5b50ee8..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
@@ -18,14 +18,20 @@
     private String operatorId;
     /**鎿嶄綔浜哄悕绉�*/
     private String operatorName;
+    /**娲诲姩鏍囪瘑*/
+    private String groupBuyId;
+    private String id;
     /**鍙戦�佽褰�*/
     private CouponRecordDto couponReleaseRecordItem;
     /**鐢ㄦ埛璇︽儏*/
     private List<UserArrDto> userArr;
 
-
+    private List<CouponItemDto> itemDtoList;
 
     /**淇敼鏃堕棿*/
     private String updateTime;
 
+    /**浼樻儬鍒告爣璇�*/
+    private String couponId;
+
 }

--
Gitblit v1.8.0