From b53a5f6d5892c658f20968e396ce0661ba403ee7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 28 二月 2024 18:22:08 +0800
Subject: [PATCH] Merge branch 'master-fwq-金额规则配置' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..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
@@ -25,7 +25,7 @@
private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
- private String id;
+ private List<String> idList;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
@@ -51,4 +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