From 05628d269dff7ad4f2e9d3419b05b4e7e5768797 Mon Sep 17 00:00:00 2001 From: luoyisheng <yangdongji@argo-ai.cn> Date: 星期三, 12 二月 2025 14:19:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java index f801cfb..b4113bb 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java @@ -133,10 +133,10 @@ * 分页查询用户 * * @param sysUserVOPage - * @param departmentId * @param nickName * @param roleId + * @param userName * @return */ - Page<SysUserVO> pageList(Page<SysUserVO> sysUserVOPage, @Param("departmentId") Long departmentId, @Param("nickName") String nickName, @Param("roleId") Long roleId, @Param("treeCode") String treeCode); + Page<SysUserVO> pageList(Page<SysUserVO> sysUserVOPage, @Param("nickName") String nickName, @Param("roleId") Long roleId, @Param("userName") String userName, @Param("treeCode") String treeCode); } -- Gitblit v1.7.1