Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java

@@ -41,6 +41,9 @@
   @JsonSerialize(using = ToStringSerializer.class)
   private   Long id;

   @ApiModelProperty(value = "设备序列号")
   private String deviceSn;

   /**
    * 设备名称
    */
@@ -175,4 +178,11 @@
    */
   @ApiModelProperty(value = "更新时间")
   private Date updateTime;


   @ApiModelProperty(value = "区域id")
   private Long areaDivideId;

   @ApiModelProperty(value = "场景管理id")
   private Long defenseSceneManageId;
}