Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-06 9b02f67b17b9dcbd798862021ac0a516d1ba69b3

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

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

    Integer querySupperOrgId();

    String getDefultAlarm();
}