fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

@@ -72,5 +72,5 @@
     */
    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);

    void insertBatchUserDept(List<TDeptToUser> deptToUserList);
    void insertBatchUserDept(@Param("deptToUserList")List<TDeptToUser> deptToUserList);
}