From ba57740f33eacb8a1d514093633e8179e6100815 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 May 2024 19:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/disputeRecord/service/IDisputeRecordService.java |    2 +-
 1 files changed, 1 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 6aa2564..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);
 
 	/**
 	 * 导出矛盾纠纷记录表

--
Gitblit v1.9.3