Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

 src/main/java/com/moral/service/AlarmConfigService.java

@@ -10,6 +10,9 @@
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
    public  AlarmConfigValue getDefaultAlarmConfigValue();

    Optional<AlarmConfig> queryByDeviceMac(String mac);

    void addOrModify(AlarmConfig alarmConfig);

}