疯狂的狮子li fd5414f82e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-ui/src/components/ImageUpload/index.vue ruoyi-ui/src/views/login.vue sql/ry_20210713.sql		2021-07-13 13:34:10 +08:00
..
aspectj	集成lock4j框架，删除redisson锁，使用lock4j的锁。	2021-06-22 16:06:02 +08:00
captcha	update 验证码生成更新为无符号整数计算	2021-05-19 22:57:34 +08:00
config	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-07-12 09:37:23 +08:00
interceptor	update 移除 fastjson 增加 jackson 工具类 重写相关业务	2021-06-13 15:39:35 +08:00
manager	update 优化 异步工厂重写 使用 spring 异步处理	2021-06-12 20:14:50 +08:00
mybatisplus	update 优化 增加MP注入异常拦截	2021-07-02 09:39:07 +08:00
security	update 移除 fastjson 增加 jackson 工具类 重写相关业务	2021-06-13 15:39:35 +08:00
web	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-07-13 13:34:10 +08:00