From bb5a5bdc383f40d3338aa50cc921a74d79d0023b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Jul 2021 16:39:56 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java
index 3dd8626..aa9e0d1 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java
@@ -18,10 +18,16 @@
     private String name;
 
     @ApiModelProperty(value = "积分")
-    private String score;
+    private Integer minScore;
+
+    @ApiModelProperty(value = "积分")
+    private Integer maxScore;
 
     @ApiModelProperty(value = "分类ID")
     private Long cateId;
+
+    @ApiModelProperty(value = "是否抢购 1-是 2-否")
+    private Integer isQg;
 
     @ApiModelProperty(value="页码")
     private int pageNo=1;
@@ -29,4 +35,10 @@
     @ApiModelProperty(value="每页显示记录数")
     private int pageSize=10;
 
+    @ApiModelProperty(hidden = true)
+    private String userId;
+
+    @ApiModelProperty(value = "排序 1-综合 2-销量 3-价格")
+    private int sort = 1;
+
 }

--
Gitblit v1.9.1