From 6a3f8907a2f9d240f8a07e7283682286d2b52c75 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期一, 08 七月 2024 16:40:31 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java | 13 +++++++++++-- 1 files changed, 11 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..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,18 +4,27 @@ import com.hz.his.dto.PageDto; import lombok.Data; +import java.math.BigDecimal; +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; + /**鍗曚釜鍟嗗搧閲戦*/ + private BigDecimal price; + /**璐拱鏁伴噺*/ + private Integer buyNum; /**绫诲瀷-椤圭洰*/ -- Gitblit v1.8.0