From 4f3fd6c40cf8ff706f86363ccd6555164f348d63 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Jun 2020 10:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/AlarmMapper.xml |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index 5ab87ad..7a7c6b0 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/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">

--
Gitblit v1.8.0