Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/java/com/moral/service/impl/DictionaryDataServiceImpl.java

@@ -22,4 +22,9 @@
    public Integer querySupperOrgId() {
        return  dataMapper.selectSupperOrgId();
    }

    @Override
    public String getDefultAlarm() {
        return dataMapper.getDefultAlarm();
    }
}