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

ZhuDongming

2020-01-09 5fcdc8ba338a9f8730262970547274b0dcfe6b4d

 src/main/java/com/moral/mapper/AlarmConfigMapper.java

@@ -21,4 +21,6 @@
    int updateByPrimaryKey(AlarmConfig record);

    AlarmConfig selectByMonitorPointId(Integer mpId);

    AlarmConfig selectByDeviceMac(String mac);
}