From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 a75b475..88a5572 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,20 +12,23 @@
@Data
@ApiModel("分页查询店铺")
public class PageComShopStoreDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
@ApiModelProperty(value = "商家姓名")
private String contacts;
@ApiModelProperty(value = "商家账号")
- private String name;
- @ApiModelProperty(value = "店铺名称")
private String account;
+ @ApiModelProperty(value = "店铺名称")
+ private String name;
@ApiModelProperty(value = "配送方式（1.商家配送 2.快递物流）")
private Integer deliveryType;
@ApiModelProperty(value = "店铺状态（1.启用 2.禁用）")
private Integer status;
- @ApiModelProperty(value = "分页-当前页数", example = "1")
- private Long pageNum;
@ApiModelProperty(value = "分页-每页记录数", example = "10")
- private Long pageSize;
+ private Long pageSize = 10L;
+ @ApiModelProperty("店铺id")
+ private Long storeId;
}
--
Gitblit v1.7.1