From eeb29e79eb51059f81dc9c2b862e25e81ae8767b Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期日, 07 四月 2024 17:40:16 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java
index 8fb14e0..1b3a0d7 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
import java.util.Map;
@Data
@@ -13,24 +14,27 @@
private Date startTime;
/**娲诲姩缁撴潫鏃堕棿*/
private Date endTime;
-
/**鐢ㄦ埛phis鏍囪瘑*/
private String userId;
- /**鏄惁鏇剧粡鍜岀幇鍦ㄦ槸vip瀹㈡埛* */
- private Boolean isVip = false;
- /**鎸囧畾鐨凷KU(鑹捐姱鑽熺殑id)* */
- private String skuId;
- /**鍔犺喘鐨凷KU(鑹捐姱鑽熺殑id)* */
- private String addSkuId;
+ /**鎸囧畾鐨凷KU*/
+ private List<UserCouponSkuVo> skuList;
+ /**鍔犺喘鎸囧畾鐨凷KU*/
+ private List<UserCouponSkuVo> addSkuList;
+
+ /**鎸囧畾鐨勫晢鍝�*/
+ private List<UserCouponGoodsVo> goodsList;
+ /**鍔犺喘鎸囧畾鐨勫晢鍝�*/
+ private List<UserCouponGoodsVo> addGoodsList;
/**鏄惁宸查鍙�,榛樿鍙鍙栦竴娆�*/
private Boolean isReceive = true;
+ /**璧犻�佷紭鎯犲埜绫诲瀷:0鏃�,1璧犻�佸ぇ棰�(5000),2璧犻�佸皬棰�(2500)*/
+ private Integer sendType = 0;
/**瑕侀鍙栫殑浼樻儬鍒告爣璇�*/
private String couponId;
/**鍔犺喘缁撹处鍚庤禒閫佺殑浼樻儬鍒告爣璇�*/
private String sendCouponId;
-
/**瑕侀鍙栫殑浼樻儬鍒镐俊鎭�*/
private Map<String, Object> couponMap;
--
Gitblit v1.8.0