From cdb2e3a30d1b3b246bb62310926a3e2d2c70ac2c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 21:42:31 +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, 10 insertions(+), 4 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 abaa219..67151b1 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
@@ -42,6 +42,12 @@
 	 */
 	@ApiModelProperty(value = "关联工单任务表ID")
 	private Long workOrderId;
+
+	/**
+	 * 巡查任务编号
+	 */
+	@ApiModelProperty(value = "巡查任务编号")
+	private String taskNo;
 	/**
 	 * 巡查任务名称
 	 */
@@ -50,7 +56,7 @@
 	/**
 	 * 巡查任务类型（巡查类/安检类等）
 	 */
-	@ApiModelProperty(value = "巡查任务类型（巡查类/安检类等）")
+	@ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
 	private String patrolTaskType;
 	/**
 	 * 执行时间
@@ -78,10 +84,10 @@
 	@ApiModelProperty(value = "任务描述")
 	private String taskDesc;
 	/**
-	 * 状态：0草稿、1待签收、2拒绝签收、3待审核
+	 * 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过
 	 */
-	@ApiModelProperty(value = "状态：0草稿、1待签收、2拒绝签收、3待审核")
-	private Byte taskStatus;
+	@ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
+	private String taskStatus;
 	/**
 	 * 区域编码
 	 */

--
Gitblit v1.9.3