疯狂的狮子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
..
aspectj	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-05-28 10:07:15 +08:00
captcha	update 验证码生成更新为无符号整数计算	2021-05-19 22:57:34 +08:00
config	add 增加验证码开关	2021-05-25 14:02:50 +08:00
datasource	同步升级3.0	2020-07-20 10:41:32 +08:00
interceptor	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2021-04-08 17:12:13 +08:00
manager	update 使用hutool 重写 UserAgent	2021-03-15 17:49:30 +08:00
mybatisplus	update 重写MP注入器	2021-04-25 09:19:38 +08:00
security	update 删除通用工具 改为使用hutool	2021-03-15 16:38:43 +08:00
web	add 增加验证码开关	2021-05-25 14:02:34 +08:00