fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -1,7 +1,12 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFlowManagement;
import com.ruoyi.system.query.TFlowManagementQuery;
import com.ruoyi.system.vo.TFlowManagementStatisticsVo;

import java.util.List;

/**
 * <p>
@@ -12,5 +17,7 @@
 * @since 2025-01-17
 */
public interface TFlowManagementService extends IService<TFlowManagement> {

    PageInfo<TFlowManagement> pageList(TFlowManagementQuery query);
    TFlowManagementStatisticsVo getPaymentStats(TFlowManagementQuery req);
    List<TFlowManagement> findByBankSerialNumber(String bankSerialNumber);
}