From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
index a972bbc..a9b8c97 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
@@ -44,12 +44,6 @@
 	private Long workOrderId;
 
 	/**
-	 * 外部来源航线Id
-	 */
-	@ApiModelProperty(value = "外部来源航线Id")
-	private String airlineld;
-
-	/**
 	 * 巡查任务编号
 	 */
 	@ApiModelProperty(value = "巡查任务编号")
@@ -70,6 +64,11 @@
 	@ApiModelProperty(value = "执行时间")
 	private Date executeTime;
 	/**
+	 * 外部来源航线Id
+	 */
+	@ApiModelProperty(value = "外部来源航线Id")
+	private String airlineId;
+	/**
 	 * 巡查任务航线URL
 	 */
 	@ApiModelProperty(value = "巡查任务航线URL")

--
Gitblit v1.9.3