Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

101captain

2022-02-18 a577ee5fdd8cddbc89f2b3d5632a7a53dd4e2d34

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java

@@ -42,4 +42,6 @@
    @NotNull(message = "分页参数不能为空")
    @Min(value = 1)
    private Long pageSize;

    private String areaCode;
}