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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

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

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

    <select id="getResult" resultType="com.moral.api.entity.HistorySecondCruiser">