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

rain

2024-04-07 1982a4f0aea16e109d3f30ddc20c2458ea0f6f31

 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>