fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -40,4 +40,7 @@
    void export(TContractQuery query);

    List<TContract> contractExportList(TContractQuery query);

    Boolean updateContractAuditStatus(String projectId, Integer submitStatus);

}