From 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 14:58:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/AlarmConfigService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java
index deab064..ec6bb06 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/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();
--
Gitblit v1.8.0