From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
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