From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
index ad464ef..a463ca3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.vo.SysUserVO;
import org.apache.ibatis.annotations.Param;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -47,8 +48,9 @@
User getUserNow(@Param("userId") int userId);
SysUserVO selectUserInfo(Long userId);
+
String seldepLimsId(int depLimsId);
- List<Map<String, Object>> getPersonList(String laboratory);
+ List<Map<String, Object>> getLaboratoryPersonList(String laboratory);
}
--
Gitblit v1.9.3