From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Mon, 02 Feb 2026 17:21:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java | 18 ++++++++++++++++++ 1 files changed, 18 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 14ad37e..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 @@ -44,6 +44,12 @@ private String deviceSn; /** + * 外部来源设备Id + */ + @ApiModelProperty(value = "外部来源设备Id") + private String airportId; + + /** * 设备名称 */ @ApiModelProperty(value = "设备名称") @@ -149,4 +155,16 @@ @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