From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/AlarmConfigMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/mapper/AlarmConfigMapper.java b/src/main/java/com/moral/mapper/AlarmConfigMapper.java
index 397db74..848dd0a 100644
--- a/src/main/java/com/moral/mapper/AlarmConfigMapper.java
+++ b/src/main/java/com/moral/mapper/AlarmConfigMapper.java
@@ -19,4 +19,8 @@
     int updateByPrimaryKeySelective(AlarmConfig record);
 
     int updateByPrimaryKey(AlarmConfig record);
+
+    AlarmConfig selectByMonitorPointId(Integer mpId);
+
+    AlarmConfig selectByDeviceMac(String mac);
 }
\ No newline at end of file

--
Gitblit v1.8.0