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

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java |   14 ++++++++++++++
 1 files changed, 14 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 6ba55b1..bfb6fd7 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
@@ -136,6 +136,20 @@
 	@ApiModelProperty(value = "有效范围 km")
 	private BigDecimal effectiveRangeKm;
 
+	/**
+	 * 工作模式:侦测中/信号干扰中/诱导驱离中/待机
+	 */
+	@ApiModelProperty(value = "工作模式:1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机")
+	private String workMode;
+	/**
+	 * 设备sn
+	 */
+	@ApiModelProperty(value = "设备sn")
+	private String deviceSn;
+
+	@ApiModelProperty(value = "场景名称")
+	private String sceneName;
+
 	@ApiModelProperty(value = "所属部门名称")
 	public String getBelongDeptName() {
 		if (belongDept == null) {

--
Gitblit v1.9.3