From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/DictionaryDataMapper.java b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
index f1720de..4ada8d1 100644
--- a/src/main/java/com/moral/mapper/DictionaryDataMapper.java
+++ b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
@@ -7,4 +7,5 @@
 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