From 87a9aade5539d7be459059ab07566af148b40a0e Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期三, 28 十二月 2022 19:04:50 +0800
Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java |    3 ++-
 1 files changed, 2 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 75ce776..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,6 +5,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author wzh
@@ -17,7 +18,7 @@
     /**sku鏍囪瘑*/
     private String skuId;
     /**spu鍟嗗搧鍒嗙被*/
-    private Integer type;
+    private List<String> typeList;
     /**鍟嗗搧绫诲瀷*/
     private Integer goodType;
     /**his鍟嗗搧绫诲瀷*/

--
Gitblit v1.8.0