From d7fef91a4cbb702988dc820bcde82c166253ceec Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 07 Mar 2026 10:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index 136018d..0dd708b 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -38,6 +38,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
+
+import static com.ard.common.utils.SecurityUtils.getUserId;
 import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
 import static com.ard.route.util.InitializationUtils.divided_23;
 import static com.ard.route.util.ToolUtils.*;
@@ -198,7 +200,7 @@
         if ("0".equals(mission.getExecuteStatus())) {
             mission.setRouteId(ardRouteInfo.getId());
             mission.setExecuteStatus("1");
-            mission.setExecuteBy(SecurityUtils.getUsername());
+            mission.setExecuteName(SecurityUtils.getUsername());
             mission.setExecuteTime(DateUtils.getNowDate());
             mission.setUpdateTime(DateUtils.getNowDate());
             ardRouteMissionMapper.updateArdRouteMission(mission);

--
Gitblit v1.9.3