From 7e80bb0a3bb2247fb519e00722b76145456981df Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 19:01:03 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java |    5 +++++
 1 files changed, 5 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 029ead5..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
@@ -20,6 +20,7 @@
     private String operatorName;
     /**娲诲姩鏍囪瘑*/
     private String groupBuyId;
+    private String id;
     /**鍙戦�佽褰�*/
     private CouponRecordDto couponReleaseRecordItem;
     /**鐢ㄦ埛璇︽儏*/
@@ -32,5 +33,9 @@
 
     /**浼樻儬鍒告爣璇�*/
     private String couponId;
+    /**鍙戞斁浼樻儬鍒稿弬鏁�-璁㈠崟鏍囪瘑*/
+    private String orderId;
+    /*鐢ㄦ埛浼樻儬鍒�*/
+    private String couponNumberId;
 
 }

--
Gitblit v1.8.0