Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 f80afdbc853857579ef24f6e679bde4be8b57e39

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

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

    private String areaCode;

}