From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java
index 711ee30..cce9baa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java
@@ -20,7 +20,6 @@
public interface TBankFlowService extends IService<TBankFlow> {
PageInfo<TBankFlow> pageList(TBankFlowQuery query);
- List<TBankFlow> makeQuery(TBankFlowQuery query);
TBankFlowStatisticsVo getPaymentStats( TBankFlowQuery query);
List<TBankFlow> searchByBankSerialNumber(String bankSerialNumber);
--
Gitblit v1.7.1