From 215884a441b4e28fff1ddf5a41a354c38a47e284 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 06 十二月 2022 18:52:11 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' 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