From 15e276b0518da45f1281ba9ce9db01d3400ec04e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 31 八月 2022 14:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java | 8 ++++++--
1 files changed, 6 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..09d8815 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
@@ -8,7 +8,7 @@
/**
* @author wzh
- * 鍟嗗搧鍙敤浼樻儬鍒告墿灞�
+ * 鍟嗗搧SKU鍙敤浼樻儬鍒告墿灞�
* */
@Data
public class GoodsCanUseCouponDto extends PageDto {
@@ -17,7 +17,11 @@
/**sku鏍囪瘑*/
private String skuId;
/**鍟嗗搧绫诲瀷*/
- private String goodType;
+ private Integer goodType;
+ /**his鍟嗗搧绫诲瀷*/
+ private String hisGoodType;
/**鍟嗗搧閲戦*/
private BigDecimal price;
+ /**鏁伴噺*/
+ private Integer num;
}
--
Gitblit v1.8.0