Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-08-31 b888331b6ba56caeeab12a4543fe81bac8854794

 screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java

@@ -187,6 +187,7 @@
        return datas;
    }


    @Override
    public Map<String, SysDictData> getDictDatasByType(String type) {
        Map<String, List<SysDictData>> allDictData = getAllDictData();