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

manailin

2021-09-30 438e0309b09a70224d6e5be0d60ac5b52aa6df48

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