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

cjl

2023-07-27 44251a92dc85a93eff59704b40b07830bde8d16f

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

@@ -40,6 +40,12 @@
        FROM history_hourly_${timeUnits}
        WHERE `time` <![CDATA[>=]]> #{start}
        AND `time` <![CDATA[<]]> #{end}
        <if test="list != null and list.size()!=0">
                and mac in
            <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
    </select>

    <insert id="insertHistoryHourlyComplete">