From 689f0a4a22dced34c3b7c9178a1708410a5a0541 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 28 九月 2021 17:06:15 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index 53c0d2b..0c4c4c4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;
+import java.time.Instant;
import java.util.List;
import javax.annotation.Resource;
@@ -570,10 +571,11 @@
/**
* 获取所有产品分类
* @return
+ * @param merchantId
*/
@GetMapping("/product-category/all")
- public R getAllProductCategory() {
- return convenientProductCategoryService.getAllProductCategory();
+ public R getAllProductCategory(@RequestParam("merchantId") Long merchantId) {
+ return convenientProductCategoryService.getAllProductCategory(merchantId);
}
/**
--
Gitblit v1.7.1