Merge branch 'huacheng_test' into haucheng_panzhihua

yanghui

2022-11-04 1a6eb2ac656de3b35c64db8b9006db2ed9248872

 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;

}