Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 868c42a04909c8842c3bc7858cb64b5f368b8f99

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

@@ -54,12 +54,12 @@
     * 获取所有便民服务分类
     * @return
     */
    R getAllServiceCategories();
    R getAllServiceCategories(String areaCode);

    /**
     * 获取该社区商家数量大于0的分类
     * @param communityId
     * @return
     */
    R getSuitableServiceCategories(Long communityId);
    R getSuitableServiceCategories(Long communityId,String areaCode);
}