fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -74,7 +74,7 @@
     * @param invoiceId
     * @return
     */
    PageInfo<TBill> getBillByInvoiceId(String invoiceId);
    PageInfo<TBillDto> getBillByInvoiceId(String invoiceId);

    Integer sendSmsByBillIds(SmsByBillDto dto);

@@ -83,4 +83,8 @@
    TBillDto getDetailByBillId(@NotEmpty String id);

    Boolean cashPay(CachPayDto offlinePayDto);

    BillStatisticsDto statistics();

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