Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-09-01 979166aaa979629bf223a44a46aeb6d0c0e61aec

 screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml

@@ -67,4 +67,15 @@
        AND `time` <![CDATA[>=]]> #{time1}
        AND `time` <![CDATA[<=]]> #{time2}
    </select>


    <select id="getDusts" resultType="java.util.Map">
        SELECT
            value ->>'$.flylat' as flyLat,value ->>'$.flylon' as flyLon,value ->>'$.dustld' as dustld,
            `time`
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{time1}
          AND `time` <![CDATA[<=]]> #{time2}
    </select>
</mapper>