From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/DeptMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index fc9df70..13ebc9b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -83,11 +83,11 @@
 	List<String> selectIn();
 	List<Map<Object,String>> selectCount();
 	List<Map<Object,String>> selectId(String id);
-	Map<Object,Object> selectHold(String deptid);
+	List<Map<String, Object>> selectHold(String deptid);
 	/**
 	 * 懒加载获取部门树形结构,不包含顶级管理员公安局
 	 */
-	List<DeptVO> securityLazyTree(String tenantId, Long parentId);
+	List<DeptVO> securityLazyTree(String jurisdiction, Long parentId);
 
 	/**
 	 * 懒加载获取部门树形结构(包含用户数据)

--
Gitblit v1.9.3