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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

 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>