From 703d5e3dcae6207ed85b0ce6d05f37ca0a36dc36 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 06 十二月 2022 19:31:12 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 255cbb5..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,8 +17,14 @@
private String userId;
/**sku鏍囪瘑*/
private String skuId;
+ /**spu鍟嗗搧鍒嗙被*/
+ private List<String> typeList;
/**鍟嗗搧绫诲瀷*/
- private String goodType;
+ private Integer goodType;
+ /**his鍟嗗搧绫诲瀷*/
+ private String hisGoodType;
/**鍟嗗搧閲戦*/
private BigDecimal price;
+ /**鏁伴噺*/
+ private Integer num;
}
--
Gitblit v1.8.0