From 15a504033f949ba6e8b9cf712a8a70052bc7d6a8 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期日, 25 六月 2023 10:20:23 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
index 863bdde..43fb2bb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
@@ -4,6 +4,9 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * 鐢ㄦ埛鍙敤浼樻儬鍒告墿灞�
  * @author wzh
@@ -16,6 +19,12 @@
     private Integer goodsType;
     /** his绫诲瀷 */
     private String hisType;
+    /**鎵�灞炲垎绫绘爣璇嗛泦鍚�*/
+    private List<String> typeIdList;
+    /**鍗曚釜鍟嗗搧閲戦*/
+    private BigDecimal price;
+    /**璐拱鏁伴噺*/
+    private Integer buyNum;
 
 
     /**绫诲瀷-椤圭洰*/

--
Gitblit v1.8.0