From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/com/doumee/service/business/CategoryService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/doumee/service/business/CategoryService.java b/server/src/main/java/com/doumee/service/business/CategoryService.java
index 6a87833..d96ce32 100644
--- a/server/src/main/java/com/doumee/service/business/CategoryService.java
+++ b/server/src/main/java/com/doumee/service/business/CategoryService.java
@@ -102,9 +102,11 @@
      * @param categoryType
      * @return
      */
-    List<CategoryVO>  getCategoryVOTree(Integer categoryType);
+    List<CategoryVO>  getCategoryVOTree(String categoryType,Integer categoryId);
 
-    List<CategoryVO>  getCategoryVOList(Integer categoryType);
+    List<CategoryVO>  getCategoryVOList(Integer categoryType,Integer isRoot);
+
+    List<CategoryVO>  getCategoryVOForGCXTree(Integer categoryId);
 
     List<Category> treeList(Category param );
 }

--
Gitblit v1.9.3