From d768d607e24628420c6416ac955e491e8d747d9d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 08 八月 2022 19:45:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java |    4 +++-
 1 files changed, 3 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 255cbb5..24401df 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
@@ -17,7 +17,9 @@
     /**sku鏍囪瘑*/
     private String skuId;
     /**鍟嗗搧绫诲瀷*/
-    private String goodType;
+    private Integer goodType;
+    /**his鍟嗗搧绫诲瀷*/
+    private String hisGoodType;
     /**鍟嗗搧閲戦*/
     private BigDecimal price;
 }

--
Gitblit v1.8.0