From f6564b610b382c6c78f0e1cb231c60ea6cf543ef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 17 六月 2025 21:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 139b071..e86bbfc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -171,9 +171,11 @@
List<SysUser> selectAllList();
- List<SysUserVO> pageList(@Param("query")SysUserQuery query, @Param("pageInfo")PageInfo<SysUserVO> pageInfo);
+ List<SysUserVO> pageList(@Param("query")SysUserQuery query);
void updatePassword(@Param("id") Long id,@Param("s") String s);
long selectIdByPhone(@Param("phonenumber") String phonenumber);
+
+ List<SysUser> selectUserByTempLateId(@Param("templateId")String templateId);
}
--
Gitblit v1.7.1