Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-02 fc5cda9c324a91948dd964e91960623b41baf293

 medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java

@@ -133,10 +133,9 @@
     * 分页查询用户
     *
     * @param sysUserVOPage
     * @param departmentId
     * @param nickName
     * @param roleId
     * @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("treeCode") String treeCode);
}