From d7fef91a4cbb702988dc820bcde82c166253ceec Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 07 Mar 2026 10:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/domain/route/ArdRouteMission.java |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteMission.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteMission.java
index 708f10c..77f6194 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteMission.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteMission.java
@@ -33,12 +33,41 @@
      */
     private String executeStatus;
 
-    /** 执行人 */
-    private String executeBy;
+    /** 执行人ID */
+    private Long executeId;
+
+    /** 执行人姓名 */
+    private String executeName;
 
     /** 执行时间 */
     private Date executeTime;
 
+    /** 下发人ID */
+    private Long issuerId;
+
+    /** 下发人姓名 */
+    private String issuerName;
+
+    /** 下发时间 */
+    private Date issuerTime;
+
+    /**
+     * 任务类型
+     * 1:报警任务
+     * 2:巡检任务
+     * */
+    private String taskType;
+
+    /** 任务描述 */
+    private String taskDescription;
+
+    /**
+     * 是否已读
+     * 0:否
+     * 1:是
+     * */
+    private String isRead;
+
     /** 航线任务航点列表 */
     private List<ArdRoutePoint> missionDetailList;
 

--
Gitblit v1.9.3