From b3fd1019f9c999f42173c941495bb34e5d0b920b Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Thu, 12 Mar 2026 14:17:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../airline/api/domain/AirlineMarkerVO.java   | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java

diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java
new file mode 100644
index 0000000..ce955c0
--- /dev/null
+++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java
@@ -0,0 +1,82 @@
+package com.ruoyi.airline.api.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 标注 VO
+ *
+ * @author 拓恒
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AirlineMarkerVO extends BaseEntity {
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 标注名称
+     */
+    private String markerName;
+
+    /**
+     * 标注类型
+     */
+    private String markerType;
+
+    /**
+     * 1 启用 0 停用。默认启用。
+     */
+    private Integer status;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 字体大小
+     */
+    private Integer fontSize;
+
+    /**
+     * 经纬度，格式：[经,纬,asl高度]
+     */
+    private String coordinates;
+
+    /**
+     * 简介
+     */
+    private String description;
+
+    /**
+     * 分组ID
+     */
+    private Long groupId;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("markerName", getMarkerName())
+                .append("markerType", getMarkerType())
+                .append("status", getStatus())
+                .append("color", getColor())
+                .append("icon", getIcon())
+                .append("fontSize", getFontSize())
+                .append("coordinates", getCoordinates())
+                .append("description", getDescription())
+                .append("groupId", getGroupId())
+                .toString();
+    }
+}

From fbc35af80c3ca4a6abacbfd583720141e82de082 Mon Sep 17 00:00:00 2001
From: gyb <gyb@example.com>
Date: Thu, 12 Mar 2026 15:08:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../airline/api/domain/AirlineMarkerVO.java   | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java
index ce955c0..e1a6f1e 100644
--- a/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java
+++ b/ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java
@@ -6,6 +6,8 @@ import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 标注 VO
  *
@@ -52,7 +54,7 @@ public class AirlineMarkerVO extends BaseEntity {
     /**
      * 经纬度，格式：[经,纬,asl高度]
      */
-    private String coordinates;
+    private List<PointInfo> coordinates;
 
     /**
      * 简介
@@ -64,6 +66,24 @@ public class AirlineMarkerVO extends BaseEntity {
      */
     private Long groupId;
 
+    @Data
+    public static class PointInfo {
+        /**
+         * 纬度
+         */
+        private Double latitude;
+
+        /**
+         * 经度
+         */
+        private Double longitude;
+
+        /**
+         * 海拔高度
+         */
+        private Double asl;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)