From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java b/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
index f03b555..98e44e8 100644
--- a/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
+++ b/ard-work/src/main/java/com/ard/work/aspect/UavControlAspect.java
@@ -102,7 +102,7 @@
                     throw new ControlException("遥测数据异常,无法执行!");
                 }
                 // 检查高度
-                if (uavTelemetryData.getAltitude() < minAltitude) {
+                if (uavTelemetryData.getUltrasonic() < minAltitude) {
                     throw new ControlException("高度太低,无法执行!最低高度: " + minAltitude);
                 }
             }

--
Gitblit v1.9.3