From d9ff3817f056ad245a16bd394133a407d6c6b9cf Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
index d2fbcc2..5507b3f 100644
--- a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
+++ b/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java
@@ -4,6 +4,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.collaborativeApproval.pojo.MeetingMinutes;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -16,7 +17,7 @@
* @author ruoyi
*/
@Mapper
-public interface SysUserMapper
+public interface SysUserMapper extends BaseMapper<SysUser>
{
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -148,7 +149,7 @@
*/
public SysUser checkEmailUnique(String email);
- List<SysUser> selectList(List<Long> registrantIds);
+ List<SysUser> selectRegistrantIds(List<Long> registrantIds);
List<SysUser> selectUsersByIds(@Param("userIds") List<Long> userIds);
--
Gitblit v1.9.3