fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -85,4 +85,6 @@
    Boolean cashPay(CachPayDto offlinePayDto);

    BillStatisticsDto statistics();

    Integer batchBillCount(String userId, List<String> billIds);
}