From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
index a89249a..224a51d 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.user.UmsAdmin;
 import com.ycl.vo.depart.UmsDepartVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +21,11 @@
     List<UmsDepart> selectDepartList();
 
     List<UmsDepartVO> selectPageByName(@Param("departName") String departName, @Param("offset") Long offset, @Param("size") Long size);
+
+    List<UmsAdmin> selectSurplusUser();
+
+    List<UmsAdmin> selectSurplusUserAndExistUser(@Param("id") Long id);
+
+    String getDepartType(Integer id);
+
 }

--
Gitblit v1.8.0