Merge branch 'hemenkou_dev' into dev

101captain

2022-03-03 4c84f9d32baeaa9942a4af74efce3d5b6297246d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientServiceCategoryService.java

@@ -61,5 +61,5 @@
     * @param communityId
     * @return
     */
    R getSuitableServiceCategories(Long communityId);
    R getSuitableServiceCategories(Long communityId,String areaCode);
}