From bba4dceccfb4d1c38b41ca3e7f9e6bc98f34d85f Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期三, 23 十一月 2022 19:05:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test --- 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