From 20825f31aba894bb3d588f0696584c4afe618d28 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 06 二月 2024 15:13:14 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 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