From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' 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