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

aix

2024-07-30 249d316e0b8c79b71b779b5716bc488e1d08a9b3

 src/main/java/com/dji/sample/log/dao/IDroneFlightLogMapper.xml

@@ -11,6 +11,9 @@
        <if test="workspaceId != null and workspaceId != ''">
            and fl.workspace_id = #{workspaceId}
        </if>
        <if test="deviceSn !=null and deviceSn != ''" >
            and fl.device_sn = #{deviceSn}
        </if>
        ORDER BY fl.end_time DESC
    </select>
</mapper>