From 9fd19bf6b3f7377e39708e929c811f66463f1bfd Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 19:15:25 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java | 6 ++----
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java | 5 +++++
2 files changed, 7 insertions(+), 4 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 a4530e0..f4ae8bd 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,11 +14,8 @@
private Date startTime;
/**娲诲姩缁撴潫鏃堕棿*/
private Date endTime;
-
/**鐢ㄦ埛phis鏍囪瘑*/
private String userId;
- /**鏄惁鏇剧粡鍜岀幇鍦ㄦ槸vip瀹㈡埛* */
- private Boolean isVip = false;
/**鎸囧畾鐨凷KU*/
private List<UserCouponSkuVo> skuList;
@@ -27,11 +24,12 @@
/**鏄惁宸查鍙�,榛樿鍙鍙栦竴娆�*/
private Boolean isReceive = true;
+ /**璧犻�佷紭鎯犲埜绫诲瀷:0鏃�,1璧犻�佸ぇ棰�(5000),2璧犻�佸皬棰�(2500)*/
+ private Integer sendType = 0;
/**瑕侀鍙栫殑浼樻儬鍒告爣璇�*/
private String couponId;
/**鍔犺喘缁撹处鍚庤禒閫佺殑浼樻儬鍒告爣璇�*/
private String sendCouponId;
-
/**瑕侀鍙栫殑浼樻儬鍒镐俊鎭�*/
private Map<String, Object> couponMap;
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java
index 17a19c3..4d79246 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponSkuVo.java
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -14,5 +15,9 @@
private String skuId;
/**sku鍚嶇О*/
private String skuName;
+ /**sku鍚嶇О*/
+ private String skuImg;
+ /**sku浠锋牸*/
+ private BigDecimal skuPrice;
}
--
Gitblit v1.8.0