Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

 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);
}