Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 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();
    }
}