From ac0f1610e21b5326d4c7c263aa5cf410d9e2465c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 16 八月 2021 16:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 a2c1d58..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
@@ -14,9 +14,21 @@
public class PageComShopStoreDTO {
@ApiModelProperty(value = "分页-当前页数",example = "1")
- private Long pageNum;
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "商家姓名")
+ private String contacts;
+ @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 = "10")
- private Long pageSize;
+ private Long pageSize = 10L;
+ @ApiModelProperty("店铺id")
+ private Long storeId;
}
--
Gitblit v1.7.1