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

cjl

2023-09-27 3bbf11c99f594a2757f601fa3c680917cea33c17

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

@@ -76,6 +76,6 @@
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{startTime}
          AND `time` <![CDATA[<=]]> #{endTtime}
          AND `time` <![CDATA[<=]]> #{endTime}
    </select>
</mapper>