疯狂的狮子li d0b2166525 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

	ruoyi-ui/src/api/system/config.js

	ruoyi-ui/src/api/system/dict/type.js

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dict/index.vue

2021-05-28 10:07:15 +08:00

..

annotation

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

2020-12-28 10:40:13 +08:00

config

update 更新基础包与核心包 lombok 化

2021-04-12 17:26:47 +08:00

constant

update 删除通用工具 改为使用hutool

2021-03-15 16:38:43 +08:00

core

fix redis反序列化异常问题

2021-05-25 13:40:18 +08:00

enums

同步升级3.0

2020-07-20 10:41:32 +08:00

exception

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

2021-05-11 17:14:53 +08:00

filter

update 同步升级 ruoyi-vue 3.5.0

2021-05-25 10:14:18 +08:00

utils

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

2021-05-28 10:07:15 +08:00