fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -232,4 +232,6 @@
     * @return 结果
     */
    public int editRole(SysRoleDTO dto);

    List<SysRole> selectRoleByUserIds(List<String> roleIds);
}