From 293dad30b91c26329aa165c6329220220e5bf8a1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 15 一月 2026 13:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns
---
ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
index 89e6074..4960d18 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
@@ -19,9 +19,10 @@
* 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃
* @param user
* @param type
+ * @param departmentId 閮ㄩ棬ID
* @return
*/
- List<User> selectUserCondition(User user, String type);
+ List<User> selectUserCondition(User user, String type, Integer departmentId);
/**
* 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
--
Gitblit v1.9.3