From fc365c426e431a73d116e5d51deaec667f4864de Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 20 Oct 2025 17:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index dafd26d..fdcc976 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -10,7 +10,7 @@
         <result property="boxName"    column="box_name"    />
         <result property="boxVersion"    column="box_version"    />
         <result property="startTime"    column="start_time"    />
-        <result property="onLine"    column="onLine"    />
+        <result property="onLine"    column="on_line"    />
         <result property="videoServer"    column="video_server"    />
         <result property="videoPort"    column="video_port"    />
         <result property="lastTaskId"    column="last_task_id"    />

--
Gitblit v1.9.3