From dae29903ff7afd3081b22fa62cc647609cc3e8e0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 27 九月 2021 16:10:47 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 2709601..d3cd3b0 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
@@ -388,7 +388,7 @@
}
/**
- * 分页查询便民服务商家
+ * 分页查询便民服务商家 运营后台
* @param pageConvenientMerchantDTO
* @return
*/
@@ -570,10 +570,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