From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/controller/DictBizController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/DictBizController.java b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
index f64c48e..af7af61 100644
--- a/src/main/java/org/springblade/modules/system/controller/DictBizController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
@@ -28,6 +28,7 @@
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.node.TreeNode;
 import org.springblade.modules.system.service.IDictBizService;
 import org.springblade.modules.system.vo.DictBizVO;
 import org.springblade.modules.system.wrapper.DictBizWrapper;
@@ -177,4 +178,13 @@
 	}
 
 
+	/**
+	 * 获取字典树
+	 */
+	@GetMapping("/dic-tree")
+	public List<TreeNode> dicTree() {
+		return dictService.getTree();
+	}
+
+
 }

--
Gitblit v1.9.3