From c38dce7eb2c94df58bee59780fe839eff5976316 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 12 八月 2022 10:12:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java | 5 ++---
1 files changed, 2 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..dcdf384 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,6 @@
private BigDecimal total;
/**婊¤冻浠舵暟*/
private Integer itemNum;
- /**鍟嗗搧瀵瑰簲鐨刪is鏍囪瘑*/
- private List<HisGoodsDto> hisGoodsDtoList;
+ /**鍟嗗搧crm sku鏍囪瘑*/
+ private List<OrderUseGoodsDto> goodsSkuList;
}
--
Gitblit v1.8.0