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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

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

@@ -50,6 +50,12 @@
        <foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
            #{monitorPointId}
        </foreach>
        <if test="macs != null and macs.size!= 0">
            and h.mac in
            <foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
                #{id}
            </foreach>
        </if>
        AND h.time = #{time}
    </select>