From a2513c6a269fb14939a8e5d16b8be13f5931bd86 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期四, 23 三月 2023 15:37:13 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java | 5 +++++ 1 files changed, 5 insertions(+), 0 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 9db72be..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 @@ -13,6 +14,8 @@ public class OrderItemCouponDto { /**鍟嗗搧绫诲瀷*/ 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