Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-06 3c3250c96a13c796aa88f1366b6d278cb95739e5

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

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

    AlarmConfig selectByMonitorPointId(Integer mpId);

    AlarmConfig selectByDeviceMac(String mac);
}