From e90d0fe42b652c9230c5e544d177dbedb3e57580 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 19 Nov 2025 13:51:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 b8648a9..9f4ec1c 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
@@ -2,7 +2,7 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
-import com.ard.route.domain.UavRouteReq;
+import com.ard.route.domain.djuav.UavRouteReq;
import lombok.Data;
/**
@@ -43,9 +43,16 @@
@Excel(name = "负载类型")
private String payload;
- /** 是否导入 */
- @Excel(name = "是否导入")
- private String isImport;
+ /** 是否只读 是否只读0：否 1：是 */
+ @Excel(name = "是否只读")
+ private String readOnly;
+
+ /** 时间排序
+ * 0：正序
+ * 1：倒序
+ */
+ @Excel(name = "时间排序")
+ private String orderByTime;
/**
* 生成kmz文件实体类
--
Gitblit v1.9.3