fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -18,8 +18,6 @@
 */
public interface TFlowManagementService extends IService<TFlowManagement> {
    PageInfo<TFlowManagement> pageList(TFlowManagementQuery query);
    List<TFlowManagement> makeQuery(TFlowManagementQuery query);
    TFlowManagementStatisticsVo getPaymentStats(TFlowManagementQuery req);


    List<TFlowManagement> findByBankSerialNumber(String bankSerialNumber);
}