From 3dd12d913b5d9c2096e53f9d14475c534b813e6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 四月 2025 08:06:32 +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 7618c8b..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(String 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