From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/AlarmConfigService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java
index e34dad5..55ee66e 100644
--- a/src/main/java/com/moral/service/AlarmConfigService.java
+++ b/src/main/java/com/moral/service/AlarmConfigService.java
@@ -8,6 +8,7 @@
 public interface AlarmConfigService {
     public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId);
     public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
+    public String getValueByOrganizationId(int organizationId);
     public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
     public  AlarmConfigValue getDefaultAlarmConfigValue();
 
@@ -15,4 +16,5 @@
 
     void addOrModify(AlarmConfig alarmConfig);
 
+    int containOrgId(Integer orgId);
 }

--
Gitblit v1.8.0