From 174051f74a5842466c68c0601832fbb5a952608e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 十二月 2022 18:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java |    4 ++++
 1 files changed, 4 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..b76cf1d 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,8 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 鐢ㄦ埛鍙敤浼樻儬鍒告墿灞�
  * @author wzh
@@ -16,6 +18,8 @@
     private Integer goodsType;
     /** his绫诲瀷 */
     private String hisType;
+    /**鎵�灞炲垎绫绘爣璇嗛泦鍚�*/
+    private List<String> typeIdList;
 
 
     /**绫诲瀷-椤圭洰*/

--
Gitblit v1.8.0