疯狂的狮子li 8231953e29 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-admin/pom.xml ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java ruoyi-admin/src/main/resources/application.yml ruoyi-common/pom.xml ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java ruoyi-framework/pom.xml ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java ruoyi-generator/pom.xml ruoyi-quartz/pom.xml ruoyi-system/pom.xml ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-ui/package.json ruoyi-ui/src/components/HeaderSearch/index.vue ruoyi-ui/src/layout/components/AppMain.vue ruoyi-ui/src/router/index.js ruoyi-ui/src/store/modules/permission.js ruoyi-ui/src/views/index.vue		2021-07-12 09:37:23 +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-07-12 09:37:23 +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	菜单路由配置支持内链访问	2021-07-11 16:31:10 +08:00