From 0a950f6746ac38fcd6813ed7076047e0f27531eb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 23 九月 2022 10:37:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
index e63776f..b7c4853 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
@@ -12,7 +12,9 @@
 @Data
 public class OrderItemCouponDto {
     /**鍟嗗搧绫诲瀷*/
-    private String goodsType;
+    private Integer goodsType;
+    /**his鍟嗗搧绫诲瀷*/
+    private String hisGoodsType;
     /**鍟嗗搧鏍囪瘑*/
     private String goodsId;
     /**sku鏍囪瘑*/

--
Gitblit v1.8.0