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

huanghongfa

2021-09-27 7ed0f86229aa2c10b75e438cc1597e830ef684d5

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

@@ -54,6 +54,7 @@
    /**
     * 获取所有产品分类
     * @return
     * @param merchantId
     */
    R getAllProductCategory();
    R getAllProductCategory(Long merchantId);
}