From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java
index a956618..8abef0f 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java
@@ -1,14 +1,10 @@
 package com.yuanchu.mom.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.DepartmentDto;
-import com.yuanchu.mom.dto.UserDto;
-import com.yuanchu.mom.pojo.Department;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.pojo.Department;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -29,6 +25,5 @@
     //鍒犻櫎閮ㄩ棬
     boolean delDepartment(Integer id);
 
-    //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
-    Map<String, Object> showUserById(Page page, UserDto user);
+    List<Department> selectDepartmentEnum();
 }

--
Gitblit v1.9.3