Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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

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