From 86793208b129e192649e4fa153887b27468046e0 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期一, 05 九月 2022 16:36:24 +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, 4 insertions(+), 0 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 4c4603a..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
@@ -20,6 +20,7 @@
     private String operatorName;
     /**娲诲姩鏍囪瘑*/
     private String groupBuyId;
+    private String id;
     /**鍙戦�佽褰�*/
     private CouponRecordDto couponReleaseRecordItem;
     /**鐢ㄦ埛璇︽儏*/
@@ -30,4 +31,7 @@
     /**淇敼鏃堕棿*/
     private String updateTime;
 
+    /**浼樻儬鍒告爣璇�*/
+    private String couponId;
+
 }

--
Gitblit v1.8.0