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/TFlowManagementService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java
index 5cbeeff..dac9331 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFlowManagementService.java
@@ -1,7 +1,12 @@
package com.ruoyi.system.service;
-import com.ruoyi.system.model.TFlowManagement;
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);
}
--
Gitblit v1.7.1