Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -14,8 +14,8 @@
    <select id="getSort" resultType="com.moral.api.entity.SecondCruiserSort">
        select road,avg(value) as "avg",time,mac from second_cruiser_sort
        where mac =#{mac}
        AND `time` <![CDATA[>]]> #{startTime}
        AND `time` <![CDATA[<=]]> #{endTime}
        AND `time` <![CDATA[>=]]> #{startTime}
        AND `time` <![CDATA[<]]> #{endTime}
        GROUP BY road ORDER BY avg DESC

    </select>