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 | 19 +++++++++++++++++++
1 files changed, 19 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 2f57aab..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
@@ -2,6 +2,7 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import org.dom4j.tree.BaseElement;
import java.math.BigDecimal;
import java.util.List;
@@ -24,6 +25,7 @@
private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
+ private List<String> idList;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
@@ -46,4 +48,21 @@
private String couponGoodsArr;
/** 璁㈠崟搴斾粯閲戦 */
private BigDecimal shouldTotal;
+
+ /** 鏄惁鏄惀閿�鍔╂墜鐢宠 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