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/mapper/TFlowManagementMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java
index 9844677..deca07e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.mapper;
-import com.ruoyi.system.model.TFlowManagement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TFlowManagement;
+import com.ruoyi.system.query.TFlowManagementQuery;
+import com.ruoyi.system.vo.TFlowManagementStatisticsVo;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -12,5 +15,5 @@
* @since 2025-01-17
*/
public interface TFlowManagementMapper extends BaseMapper<TFlowManagement> {
-
+ TFlowManagementStatisticsVo getPaymentStats(@Param("req") TFlowManagementQuery query);
}
--
Gitblit v1.7.1