From 3421ec9112c3742c76b2f733434c3ee499f5be8a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 19 Jun 2020 16:25:45 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/resources/mapper/AlarmMapper.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml
index 34705d9..f070bda 100644
--- a/src/main/resources/mapper/AlarmMapper.xml
+++ b/src/main/resources/mapper/AlarmMapper.xml
@@ -3,7 +3,6 @@
<mapper namespace="com.moral.mapper.AlarmMapper">
<select id="getAlarmData" resultType="java.util.LinkedHashMap">
SELECT
- mac,
json_search ( json, 'all', '1' ) '1',
json_search ( json, 'all', '2' ) '2',
json_search ( json, 'all', '3' ) '3'
--
Gitblit v1.8.0