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

cjl

2023-09-28 39dc3d6f7168eae8fda1b0fe6671be819d35c732

 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>