From 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 16:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java b/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
index e82695d..d394298 100644
--- a/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/kml/RoutePointInfo.java
@@ -1,6 +1,6 @@
 package com.ard.route.domain.kml;
 
-import com.ard.route.domain.PointActionReq;
+import com.ard.route.domain.ActionGroupReq;
 import com.ard.route.domain.WaypointHeadingReq;
 import com.ard.route.domain.WaypointTurnReq;
 import lombok.Data;
@@ -54,7 +54,7 @@
     /**
      * 航点动作列表
      */
-    private List<PointActionReq> actions;
+    private List<ActionGroupReq> actionGroupList;
 
     /**
      * 是否首尾航点(首尾航点不能是协调转弯类型)

--
Gitblit v1.9.3