Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

@@ -18,4 +18,13 @@
        query.setDictDataKey(dictDataKey);
        return  dataMapper.select(query);
    }
    @Override
    public Integer querySupperOrgId() {
        return  dataMapper.selectSupperOrgId();
    }

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