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/IRegionService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IRegionService.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IRegionService.java
index d137ac0..74c209e 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/IRegionService.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/IRegionService.java
@@ -21,6 +21,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.sxkj.system.entity.Region;
 import org.sxkj.system.excel.RegionExcel;
+import org.sxkj.system.excel.RegionImportExcel;
 import org.sxkj.system.param.RegionPageParam;
 import org.sxkj.system.vo.RegionVO;
 import org.sxkj.system.vo.TreeVo;
@@ -85,7 +86,7 @@
 	 * @param isCovered
 	 * @return
 	 */
-	void importRegion(List<RegionExcel> data, Boolean isCovered);
+	void importRegion(List<RegionImportExcel> data, Boolean isCovered);
 
 	/**
 	 * 导出区划数据

--
Gitblit v1.9.3