From 5af76a40e7ab8c74a8f139e6581ce811ec7c596f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 07 十二月 2022 12:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
index 24401df..283abfa 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
@@ -5,10 +5,11 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author wzh
- * 鍟嗗搧鍙敤浼樻儬鍒告墿灞�
+ * 鍟嗗搧SKU鍙敤浼樻儬鍒告墿灞�
  * */
 @Data
 public class GoodsCanUseCouponDto extends PageDto {
@@ -16,10 +17,14 @@
     private String userId;
     /**sku鏍囪瘑*/
     private String skuId;
+    /**spu鍟嗗搧鍒嗙被*/
+    private List<String> typeList;
     /**鍟嗗搧绫诲瀷*/
     private Integer goodType;
     /**his鍟嗗搧绫诲瀷*/
     private String hisGoodType;
     /**鍟嗗搧閲戦*/
     private BigDecimal price;
+    /**鏁伴噺*/
+    private Integer num;
 }

--
Gitblit v1.8.0