From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java |   10 ++--------
 1 files changed, 2 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..56b7bff 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;

--
Gitblit v1.7.1