From 7941db00ace2a95cf5d65b51d7ad600c225b2eda Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:06:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java
index 208b2fe..6cb2bc1 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IDeptService.java
@@ -23,6 +23,7 @@
 import org.sxkj.common.node.TreeStringNode;
 import org.sxkj.system.entity.Dept;
 import org.sxkj.system.excel.DeptExcel;
+import org.sxkj.system.excel.DeptImportExcel;
 import org.sxkj.system.param.DeptExportParam;
 import org.sxkj.system.param.DeptPageParam;
 import org.sxkj.system.vo.DeptVO;
@@ -202,7 +203,7 @@
 	 * @param data
 	 * @param isCovered
 	 */
-	void importDept(List<DeptExcel> data, Boolean isCovered);
+	void importDept(List<DeptImportExcel> data, Boolean isCovered);
 
 	/**
 	 * 导出部门

--
Gitblit v1.9.3