Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-20 fc365c426e431a73d116e5d51deaec667f4864de

 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"    />