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/impl/ConvenientProductCategoryServiceImpl.java

@@ -109,7 +109,7 @@
    }

    @Override
    public R getAllProductCategory() {
        return R.ok(this.baseMapper.selectAllCategories());
    public R getAllProductCategory(Long merchantId) {
        return R.ok(this.baseMapper.selectAllCategories(merchantId));
    }
}