From f721ee13dc5f95f607bb25b09f73cae6a7123ed9 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期六, 17 四月 2021 17:56:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java
index acf661c..3ded3b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java
@@ -12,6 +12,9 @@
 @Data
 @ApiModel("分页查询店铺")
 public class PageComShopStoreDTO {
+
+    @ApiModelProperty(value = "分页-当前页数",example = "1")
+    private Long pageNum = 1L;
     @ApiModelProperty(value = "商家姓名")
     private String contacts;
     @ApiModelProperty(value = "商家账号")
@@ -22,10 +25,10 @@
     private Integer deliveryType;
     @ApiModelProperty(value = "店铺状态(1.启用  2.禁用)")
     private Integer status;
-    @ApiModelProperty(value = "分页-当前页数", example = "1")
-    private Long pageNum;
 
-    @ApiModelProperty(value = "分页-每页记录数", example = "10")
-    private Long pageSize;
+    @ApiModelProperty(value = "分页-每页记录数",example = "10")
+    private Long pageSize = 10L;
 
+    @ApiModelProperty("店铺id")
+    private Long storeId;
 }

--
Gitblit v1.7.1