From fc7ee73b5f804116ada59048fdf6fb9265856a3f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 04 Feb 2026 09:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
index 3835f2c..54fece0 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -1,6 +1,5 @@
package com.ard.route.domain.route;
-import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import com.ard.route.domain.djuav.UavRouteReq;
import lombok.Data;
@@ -22,27 +21,26 @@
private String id;
/** 文件名称 */
- @Excel(name = "文件名称")
private String name;
/** 文件路径 */
- @Excel(name = "文件路径")
private String path;
/** 分组ID */
- @Excel(name = "分组ID")
private String groupId;
- /** 航线类型 */
- @Excel(name = "航线类型")
+ /**
+ * 航线类型
+ * 1：逐点巡检
+ * 2：沿线巡检
+ * 3：巡检航线
+ * */
private String type;
/** 飞行器产品 */
- @Excel(name = "飞行器产品")
private String aircraft;
/** 负载类型 */
- @Excel(name = "负载类型")
private String payload;
/**
@@ -50,7 +48,6 @@
* 0：否
* 1：是
*/
- @Excel(name = "是否只读")
private String readOnly;
/**
@@ -58,7 +55,6 @@
* 0：正序
* 1：倒序
*/
- @Excel(name = "时间排序")
private String orderByTime;
/**
@@ -66,7 +62,6 @@
* 0：否
* 1：是
*/
- @Excel(name = "是否循环")
private String isLoop;
/**
@@ -80,4 +75,7 @@
/** 行点总数 */
private Integer pointCount;
+ /** 航线任务ID */
+ private String missionId;
+
}
--
Gitblit v1.9.3