Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java

@@ -86,7 +86,7 @@
    * 关联设备ID
    */
   @ApiModelProperty(value = "关联设备ID")
   private String deviceId;
   private Long deviceId;

   @ApiModelProperty(value = "设备名称")
   private String deviceName;
@@ -138,4 +138,7 @@
   @ApiModelProperty(value = "逻辑删除")
   private Integer isDeleted;

   @ApiModelProperty(value = "机场id")
   private String airportId;

}