From 7e93173fbe1cff78dc93bee3846d38624abdd092 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 03 Nov 2021 18:02:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-public
---
src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java b/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
index b132783..0b544fd 100644
--- a/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
+++ b/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
@@ -23,6 +23,7 @@
import org.springblade.modules.catalog.mapper.catalogMapper;
import org.springblade.modules.catalog.service.catalogService;
import org.springblade.modules.catalog.vo.catalogVO;
+import org.springblade.modules.system.vo.DeptVO;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -93,7 +94,7 @@
* @return
*/
@Override
- public List<catalogVO> getBigTree() {
+ public List<DeptVO> getBigTree() {
return ForestNodeMerger.merge(baseMapper.getBigTree());
}
}
--
Gitblit v1.9.3