From f7cf57b99def748f2981ff4811b9ab435b5df856 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 18:51:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
index 96f79ff..f1aa5a0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
@@ -116,6 +116,12 @@
 	private int effectiveRangeKmIsNotNull ;
 
 	/**
+	 * 是否出库
+	 */
+	@ApiModelProperty(value = "是否出库 0不过滤 1是 2否")
+	private int isTrack;
+
+	/**
 	 * 设备状态，多个状态用逗号隔
 	 */
 	@ApiModelProperty(value = "设备状态，多个状态用逗号隔开")

--
Gitblit v1.9.3