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

ZhuDongming

2019-08-22 d10235124e675103c1a27fb5aeff337493413cc2

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