From 65062dda23142cb5b03114111550b89d365533ee Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 14:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 1441d9a..a972bbc 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,6 +44,12 @@
 	private Long workOrderId;
 
 	/**
+	 * 外部来源航线Id
+	 */
+	@ApiModelProperty(value = "外部来源航线Id")
+	private String airlineld;
+
+	/**
 	 * 巡查任务编号
 	 */
 	@ApiModelProperty(value = "巡查任务编号")
@@ -87,11 +93,17 @@
 	 * 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过
 	 */
 	@ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
-	private Byte taskStatus;
+	private String taskStatus;
 	/**
 	 * 区域编码
 	 */
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
 
+	/**
+	 * 拒绝原因（审核拒绝时必填）
+	 */
+	@ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+	private String rejectReason;
+
 }

--
Gitblit v1.9.3