From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Thu, 29 Jan 2026 10:09:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java | 6 +++++- 1 files changed, 5 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 dcdc1f5..008a0d3 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 @@ -68,6 +68,10 @@ */ @ApiModelProperty(value = "执行时间") private Date executeTime; + + @ApiModelProperty(value = "巡查任务航线ID") + private String airlineId; + /** * 巡查任务航线URL */ @@ -82,7 +86,7 @@ * 关联设备ID */ @ApiModelProperty(value = "关联设备ID") - private Long deviceId; + private String deviceId; @ApiModelProperty(value = "设备名称") private String deviceName; -- Gitblit v1.9.3