Merge branch 'haucheng_panzhihua' into shuangzheng2

101captain

2022-08-01 0a4aee700a60c4b28248f3d1a7f4f91376b68492

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