Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-01 c5e8177c3fbc27ac825f38c465383903adb87596

 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;

}