Merge branch 'local_20221104' into haucheng_panzhihua

yanghui

2022-11-10 dd99da83d2708dc1fdb84f9fa71b5e63d5579338

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

@@ -38,4 +38,6 @@
    @Min(value = 1)
    private Long pageSize;

    private String areaCode;

}