From bf1f6714fef31bf1e057e21bd7820a3b81610046 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 07 十二月 2022 16:18:18 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 6e66d22..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,18 +4,22 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 鐢ㄦ埛鍙敤浼樻儬鍒告墿灞�
  * @author wzh
  */
 @Data
 public class OrderUseGoodsDto extends PageDto {
-    /**CRM sku鏍囪瘑*/
+    /**鍟嗗搧sku鏍囪瘑*/
     private String skuId;
     /**鍟嗗搧绫诲瀷*/
     private Integer goodsType;
     /** his绫诲瀷 */
     private String hisType;
+    /**鎵�灞炲垎绫绘爣璇嗛泦鍚�*/
+    private List<String> typeIdList;
 
 
     /**绫诲瀷-椤圭洰*/

--
Gitblit v1.8.0