From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 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 f9513c0..b229990 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
@@ -38,6 +38,18 @@
public class FwDeviceEntity extends BaseEntity {
/**
+ * 设备sn
+ */
+ @ApiModelProperty(value = "设备sn")
+ private String deviceSn;
+
+ /**
+ * 外部来源设备Id
+ */
+ @ApiModelProperty(value = "外部来源设备Id")
+ private String airportId;
+
+ /**
* 设备名称
*/
@ApiModelProperty(value = "设备名称")
@@ -128,9 +140,31 @@
@ApiModelProperty(value = "工作模式：侦测中/信号干扰中/诱导驱离中/待机")
private String workMode;
/**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+ /**
* 区域编码
*/
@ApiModelProperty(value = "区域编码")
private String areaCode;
+ /**
+ * 设备出入库状态 0未出库1已出库
+ */
+ @ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+ private Integer trackStatus;
+
+ @ApiModelProperty(value = "最终出库区域（设备出库后的部署区域名称/编码）")
+ private String finalOutboundArea;
+
+ @ApiModelProperty(value = "是否启用：1启用 0禁用")
+ private Boolean isEnabled;
+
}
--
Gitblit v1.9.3