From 1cc34b1ca79017139b79756dcd6247eb47fc41b6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 21 十一月 2023 15:48:52 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java |    6 ++++++
 1 files changed, 6 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 2e30c02..b00b365 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,6 +51,12 @@
 
     /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
     private Integer isMarketApply = 0;
+    /**鏄惁鏌ヨ鍏宠仈淇℃伅*/
+    private Integer isSelectGoods = 1;
+    /**鏌ヨ鐢熸棩鍒�*/
+    private Integer isSelectBirthday;
+    /**浼樻儬鍒哥被鍨�*/
+    private String couponType;
 
     /** 浼樻儬鍒稿垎绫籌D*/
     private String couponTypeId;

--
Gitblit v1.8.0