From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceTrackExcel.java |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceTrackExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceTrackExcel.java
index 99104c6..cb1b874 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceTrackExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceTrackExcel.java
@@ -30,7 +30,7 @@
 /**
  * 设备跟踪流转表 Excel实体类
  *
- * @author Aix
+ * @author aix
  * @since 2026-01-08
  */
 @Data
@@ -77,12 +77,6 @@
 	@ColumnWidth(20)
 	@ExcelProperty("联系电话")
 	private String contactPhone;
-	/**
-	 * 部门名称
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("部门名称")
-	private String deptName;
 	/**
 	 * 区域编码
 	 */

--
Gitblit v1.9.3