From c800715e798d45e50aa6b8e6930a7a680526177d Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 10 八月 2022 14:27:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
index 58a9895..6e66d22 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
@@ -13,7 +13,7 @@
     /**CRM sku鏍囪瘑*/
     private String skuId;
     /**鍟嗗搧绫诲瀷*/
-    private String goodsType;
+    private Integer goodsType;
     /** his绫诲瀷 */
     private String hisType;
 

--
Gitblit v1.8.0