From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java |   19 +++++++++++--------
 1 files changed, 11 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 f2380c6..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
@@ -14,24 +14,27 @@
     private Date startTime;
     /**娲诲姩缁撴潫鏃堕棿*/
     private Date endTime;
-
     /**鐢ㄦ埛phis鏍囪瘑*/
     private String userId;
-    /**鏄惁鏇剧粡鍜岀幇鍦ㄦ槸vip瀹㈡埛* */
-    private Boolean isVip = false;
 
-    /**鎸囧畾鐨凷KU(鑹捐姱鑽熺殑id)* */
-    private List<String> skuIdList;
-    /**鍔犺喘鐨凷KU(鑹捐姱鑽熺殑id)* */
-    private List<String> addSkuIdList;
+    /**鎸囧畾鐨凷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