From ffb7bf307d13056bcf244b949cfe2f0ff15e0001 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee/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