From 596fbb32e2a26579b66818e33ed472d74c1c070a Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期五, 02 十二月 2022 10:37:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 58a9895..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 String goodsType;
+ private Integer goodsType;
/** his绫诲瀷 */
private String hisType;
+ /**鎵�灞炲垎绫绘爣璇嗛泦鍚�*/
+ private List<String> typeIdList;
/**绫诲瀷-椤圭洰*/
--
Gitblit v1.8.0