From 016caee2dd92a8c352834c382fd340b39fddc9ab Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 16:49:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
index 1d2617f..35ab4d0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
@@ -47,7 +47,7 @@
 	 * 外部来源设备Id
 	 */
 	@ApiModelProperty(value = "外部来源设备Id")
-	private String airportld;
+	private String airportId;
 
 	/**
 	 * 设备名称
@@ -155,4 +155,10 @@
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
 
+	/**
+	 * 设备出入库状态 0未出库1已出库
+	 */
+	@ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+	private Integer trackStatus;
+
 }

--
Gitblit v1.9.3