From ad4edbbf6ad2f20df3c21e60798ea649a47289ff Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 08 八月 2023 16:47:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' 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 fdb98a9..260182b 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
@@ -51,4 +51,9 @@
 
     /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
     private Integer isMarketApply = 0;
+
+    /** 浼樻儬鍒稿垎绫籌D*/
+    private String couponTypeId;
+    /** 鍩虹鍒嗙被-浼樻儬鍒�*/
+    private String type;
 }

--
Gitblit v1.8.0