疯狂的狮子li aa14085746 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml ruoyi-ui/src/api/system/role.js ruoyi-ui/src/api/system/user.js ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/router/index.js ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue		2021-07-06 12:01:05 +08:00
..
annotation	集成lock4j框架，删除redisson锁，使用lock4j的锁。	2021-06-22 16:06:02 +08:00
config	update 更新基础包与核心包 lombok 化	2021-04-12 17:26:47 +08:00
constant	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-06-17 18:15:34 +08:00
core	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-07-06 12:01:05 +08:00
enums	update 优化多数据源aop顺序问题	2021-06-22 13:43:05 +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 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题	2021-06-12 20:13:35 +08:00
utils	fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题	2021-06-29 15:22:45 +08:00