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

manailin

2021-10-08 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java

@@ -67,4 +67,11 @@
     * @return
     */
    int checkCategoryIsUsing(@Param("categoryId") Long categoryId);

    /**
     * 获取该社区商家数量大于0的分类
     * @param communityId
     * @return
     */
    List<ConvenientServiceCategoryVO> selectSuitableServiceCategories(@Param("communityId") Long communityId);
}