Merge remote-tracking branch 'origin/master'

luoyisheng

2025-02-12 05628d269dff7ad4f2e9d3419b05b4e7e5768797

 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);
}