Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-23 b0ccb0c3aed69745cfe44f8b0707becf56b56f6e

 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;
}