Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-10 ef431a71ed043e8fb63777793df23c110b853803

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

@@ -8,5 +8,6 @@
public interface AlarmConfigService {
    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
    void addOrModify(AlarmConfig alarmConfig);
}