From 5af76a40e7ab8c74a8f139e6581ce811ec7c596f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 07 十二月 2022 12:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java | 7 ++++++-
1 files changed, 6 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..76b709c 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
@@ -4,6 +4,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @author wzh
@@ -12,7 +13,9 @@
@Data
public class OrderItemCouponDto {
/**鍟嗗搧绫诲瀷*/
- private String goodsType;
+ private Integer goodsType;
+ /**his鍟嗗搧绫诲瀷*/
+ private String hisGoodsType;
/**鍟嗗搧鏍囪瘑*/
private String goodsId;
/**sku鏍囪瘑*/
@@ -21,4 +24,6 @@
private Integer goodsNum;
/**璁㈠崟閲戦*/
private BigDecimal total;
+ /**鎵�灞炲晢鍝佸垎绫绘爣璇�*/
+ private List<String> goodsTypeList;
}
--
Gitblit v1.8.0