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

zhaowenyu

2025-11-26 ffc176faeea3b9bd1a7cd69d020a0730b1a58356

 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}