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

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

 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);
}