fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java

@@ -35,5 +35,8 @@
    private String flowId;
    @TableField("variable")
    private String variable;
    @ApiModelProperty(value = "合同项目id")
    @TableField("project_id")
    private String projectId;

}