From 0a8119461bea9b913819d302b8820f1dc2cf420c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 07 一月 2025 17:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 0384d59..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
@@ -135,7 +135,8 @@
      * @param sysUserVOPage
      * @param nickName
      * @param roleId
+     * @param userName
      * @return
      */
-    Page<SysUserVO> pageList(Page<SysUserVO> sysUserVOPage, @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