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

zhaowenyu

2025-11-25 aae8b5dc994fffdc211b1f0fc860840cb0d4687a

 ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml

@@ -114,7 +114,7 @@
    </update>

    <!-- 根据任务ID获取飞行任务 -->
    <select id="getArdFlightTaskById" resultType="ArdFlightTask">
    <select id="getArdFlightTaskById" resultMap="ArdFlightTaskResult">
        SELECT *
        FROM ard_flight_task
        WHERE task_id = #{taskId}