Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 016caee2dd92a8c352834c382fd340b39fddc9ab

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java

@@ -47,7 +47,7 @@
    * 外部来源设备Id
    */
   @ApiModelProperty(value = "外部来源设备Id")
   private String airportld;
   private String airportId;

   /**
    * 设备名称
@@ -155,4 +155,10 @@
   @ApiModelProperty(value = "区域编码")
   private String areaCode;

   /**
    * 设备出入库状态 0未出库1已出库
    */
   @ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
   private Integer trackStatus;

}