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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

@@ -134,7 +134,6 @@
        //清除缓存
        CacheUtils.clearDictionariesCache();
        //封装返回对象
        dto.setSysDictType(sysDictType);
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;