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

jinpengyong

2023-11-10 4686da41b376617f6d447b3546c045ce54f032fa

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

@@ -219,6 +219,7 @@
            QueryWrapper<SysDictData> wrapper = new QueryWrapper<>();
            wrapper.eq("is_delete", Constants.NOT_DELETE);
            wrapper.eq("dict_type_id", type.getId());
            wrapper.orderByAsc("id");
            List<SysDictData> datas = sysDictDataMapper.selectList(wrapper);
            result.put(type.getName(), datas);
        }