Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

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

    AlarmConfig selectByMonitorPointId(Integer mpId);

    AlarmConfig selectByDeviceMac(String mac);
}