From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java b/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java
index a0795e0..1428a82 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java
@@ -45,7 +45,7 @@
 	 * 矛盾纠纷事件数据导入类
 	 * @author Chill
 	 */
-	void importDisputeRecord(List<DisputeRecordExcel> data, Boolean isCovered);
+	String importDisputeRecord(List<DisputeRecordExcel> data, Boolean isCovered);
 
 	/**
 	 * 导出矛盾纠纷记录表
@@ -53,4 +53,9 @@
 	 * @return
 	 */
 	List<ExportDisputeRecordExcel> exportDisputeRecordList(DisputeRecordVO disputeRecord);
+
+	/**
+	 * e呼即办数据临时转换到矛盾纠纷
+	 */
+    void eCallToDis();
 }

--
Gitblit v1.9.3