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

jinpengyong

2023-09-15 cc2e35bac3aca6d98b337a0b306c279f036ce989

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

@@ -75,7 +75,7 @@
            `time`
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{time1}
          AND `time` <![CDATA[<=]]> #{time2}
          AND `time` <![CDATA[>=]]> #{startTime}
          AND `time` <![CDATA[<=]]> #{endTime}
    </select>
</mapper>