From 62f930cee9ef7031421890cd2c9b636f10ef727a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 20 Nov 2025 10:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 b7e5fb9..d12c4d4 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,8 +2,9 @@
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;
+import lombok.EqualsAndHashCode;
/**
* 航线(kmz)对象 ard_route_info
@@ -11,6 +12,7 @@
* @author xia
* @date 2025-10-23
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdRouteInfo extends BaseEntity {
@@ -47,6 +49,13 @@
@Excel(name = "是否只读")
private String readOnly;
+ /** 时间排序
+ * 0：正序
+ * 1：倒序
+ */
+ @Excel(name = "时间排序")
+ private String orderByTime;
+
/**
* 生成kmz文件实体类
*/
--
Gitblit v1.9.3