From a0c9152e2c92ea31361223852c1328c3155304e6 Mon Sep 17 00:00:00 2001
From: liyuqian <201963020@qq.com>
Date: 星期三, 10 八月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java |    4 +++-
 1 files changed, 3 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..4c4603a 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,12 +18,14 @@
     private String operatorId;
     /**鎿嶄綔浜哄悕绉�*/
     private String operatorName;
+    /**娲诲姩鏍囪瘑*/
+    private String groupBuyId;
     /**鍙戦�佽褰�*/
     private CouponRecordDto couponReleaseRecordItem;
     /**鐢ㄦ埛璇︽儏*/
     private List<UserArrDto> userArr;
 
-
+    private List<CouponItemDto> itemDtoList;
 
     /**淇敼鏃堕棿*/
     private String updateTime;

--
Gitblit v1.8.0