From 5130ec75c97e97592b5d5468273bd2187fd1fa12 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 07 二月 2024 12:48:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java | 5 +++++
phis-feign/src/main/java/com/hz/his/vo/user/UserCouponGoodsVo.java | 20 ++++++++++++++++++++
2 files changed, 25 insertions(+), 0 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 f4ae8bd..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
@@ -22,6 +22,11 @@
/**鍔犺喘鎸囧畾鐨凷KU*/
private List<UserCouponSkuVo> addSkuList;
+ /**鎸囧畾鐨勫晢鍝�*/
+ private List<UserCouponGoodsVo> goodsList;
+ /**鍔犺喘鎸囧畾鐨勫晢鍝�*/
+ private List<UserCouponGoodsVo> addGoodsList;
+
/**鏄惁宸查鍙�,榛樿鍙鍙栦竴娆�*/
private Boolean isReceive = true;
/**璧犻�佷紭鎯犲埜绫诲瀷:0鏃�,1璧犻�佸ぇ棰�(5000),2璧犻�佸皬棰�(2500)*/
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponGoodsVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponGoodsVo.java
new file mode 100644
index 0000000..9af909c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/UserCouponGoodsVo.java
@@ -0,0 +1,20 @@
+package com.hz.his.vo.user;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * SKU瀹炰綋-鐑帥鍚夋椿鍔�
+ * */
+@Data
+public class UserCouponGoodsVo {
+
+ /**鍟嗗搧鏍囪瘑*/
+ private String goodsId;
+ /**鍟嗗搧鍚嶇О*/
+ private String goodsName;
+ /**鍟嗗搧鍚嶇О*/
+ private String goodsImg;
+
+}
--
Gitblit v1.8.0