From 7941db00ace2a95cf5d65b51d7ad600c225b2eda Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:06:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
index 008a0d3..4f3eb31 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
+++ b/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;
+
 }

--
Gitblit v1.9.3