Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -8,4 +8,6 @@
    List<DictionaryData> queryByKey(String dictDataKey);

    Integer querySupperOrgId();

    String getDefultAlarm();
}