From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
index 31983d2..6405ba9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
@@ -2,7 +2,6 @@
 
 
 import com.hz.his.dto.PageDto;
-import com.hz.his.dto.user.coupon.HisGoodsDto;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -20,6 +19,8 @@
     private BigDecimal total;
     /**婊¤冻浠舵暟*/
     private Integer itemNum;
+    /**骞冲彴绫诲瀷*/
+    private String platform;
     /**鍟嗗搧crm sku鏍囪瘑*/
-    private List<HisGoodsDto> hisGoodsDtoList;
+    private List<OrderUseGoodsDto> goodsSkuList;
 }

--
Gitblit v1.8.0