From bed0665e9e734707c5001dcfc090fa5faa115e84 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 11:51:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java |   10 ++++++++++
 1 files changed, 10 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..d4d86fa 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,11 @@
     private Integer goodsNum;
     /**璁㈠崟閲戦*/
     private BigDecimal total;
+    /**鎵�灞炲晢鍝佸垎绫绘爣璇�*/
+    private List<String> goodsTypeList;
+
+    /**鍗曚釜鍟嗗搧閲戦*/
+    private BigDecimal price;
+    /**璐拱鏁伴噺*/
+    private Integer buyNum;
 }

--
Gitblit v1.8.0