Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-21 c5f9d214b2d63506cfbab5cc977610da3b133ec4

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