Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -55,4 +55,11 @@
     * @return
     */
    R getAllServiceCategories();

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