Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 src/main/resources/mapper/AlarmMapper.xml

@@ -12,11 +12,6 @@
        WHERE
        time >= #{start}
        AND time <![CDATA[<]]> #{end}
        AND mac in
        <foreach collection="macs" open="(" separator="," close=")"
                 item="mac">
            #{mac}
        </foreach>
    </select>

    <insert id="insertAlarmDaily">