From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/DictionaryDataMapper.java b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
index 0bb1798..4ada8d1 100644
--- a/src/main/java/com/moral/mapper/DictionaryDataMapper.java
+++ b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
@@ -6,4 +6,6 @@
 
 public interface DictionaryDataMapper extends BaseMapper<DictionaryData> {
     public  Integer selectSupperOrgId();
+    public  boolean isSupperOrgId(Integer orgId);
+    String getDefultAlarm();
 }
\ No newline at end of file

--
Gitblit v1.8.0