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/entity/FwDeviceTrackEntity.java |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceTrackEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceTrackEntity.java
index 4c03e3e..984bb93 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceTrackEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceTrackEntity.java
@@ -17,18 +17,18 @@
 package org.sxkj.fw.device.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
 
 /**
  * 设备跟踪流转表 实体类
  *
- * @author Aix
+ * @author aix
  * @since 2026-01-08
  */
 @Data
@@ -67,11 +67,6 @@
 	 */
 	@ApiModelProperty(value = "联系电话")
 	private String contactPhone;
-	/**
-	 * 部门名称
-	 */
-	@ApiModelProperty(value = "部门名称")
-	private String deptName;
 	/**
 	 * 区域编码
 	 */

--
Gitblit v1.9.3