Merge remote-tracking branch 'origin/test' into test

101captain

2021-10-13 da9488337f2f350c08b068fe1fcf31c82710c54c

 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;