From 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96 Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期五, 21 十月 2022 17:52:18 +0800 Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev --- 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