From 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 六月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 daed734..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;
- /**鍟嗗搧瀵瑰簲鐨刪is鏍囪瘑*/
- private List<HisGoodsDto> hisGoodsDtoList;
+ /**骞冲彴绫诲瀷*/
+ private String platform;
+ /**鍟嗗搧crm sku鏍囪瘑*/
+ private List<OrderUseGoodsDto> goodsSkuList;
}
--
Gitblit v1.8.0