From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/DeptMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 798858c..00b950c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -80,7 +80,7 @@
 	List<String> selectIn();
 	List<Map<Object,String>> selectCount();
 	List<Map<Object,String>> selectId(String id);
-	Map<Object,Integer> selectHold(String deptid);
+	Map<Object,Object> selectHold(String deptid);
 	/**
 	 * 懒加载获取部门树形结构,不包含顶级管理员公安局
 	 */

--
Gitblit v1.9.3