fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessTaskListVO.java

@@ -36,6 +36,7 @@
    private Date createTime;

    private String status;
    private Integer taskState;

    private String taskId;