From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java
index 23ae32f..dc68734 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java
@@ -18,14 +18,8 @@
@ApiModel("分页查询便民服务商家请求参数")
public class PageConvenientMerchantDTO {
- @ApiModelProperty("商家名称")
- private String name;
-
- @ApiModelProperty("商家名称")
- private String address;
-
- @ApiModelProperty("咨询电话")
- private String phone;
+ @ApiModelProperty("关键词")
+ private String keyword;
@ApiModelProperty("社区id")
private Long communityId;
@@ -48,4 +42,6 @@
@NotNull(message = "分页参数不能为空")
@Min(value = 1)
private Long pageSize;
+
+ private String areaCode;
}
--
Gitblit v1.7.1