Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-29 2ac80d588a68f60084d8bcc02aabd18c91100267

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

@@ -6,7 +6,7 @@
import java.util.Optional;

public interface AlarmConfigService {
    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
    public  AlarmConfigValue getDefaultAlarmConfigValue();