fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java

@@ -44,4 +44,6 @@
    BigDecimal statisticsPayed();

    BigDecimal statisticsOverdue();

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