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/vo/FwDeviceVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
index 48b575c..4960103 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
@@ -91,6 +91,12 @@
 	private Long belongDept;
 
 	/**
+	 * 设备出入库状态 0未出库1已出库
+	 */
+	@ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+	private Integer trackStatus;
+
+	/**
 	 * 负责人
 	 */
 	@ApiModelProperty(value = "负责人")

--
Gitblit v1.9.3