From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

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

--
Gitblit v1.8.0