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

cjl

2023-11-22 319fdcaa2d7979b056b2801e11d08fe6ecdff126

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

@@ -202,6 +202,7 @@
    private List<SysDictType> getAllDictTypeFromDB() {
        QueryWrapper<SysDictType> wrapper = new QueryWrapper<>();
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        wrapper.orderByAsc("id");
        List<SysDictType> sysDictTypes = sysDictTypeMapper.selectList(wrapper);
        return sysDictTypes;
    }