疯狂的狮子li eb2be90e74 Merge remote-tracking branch 'origin/dev' ... # Conflicts: # README.md # docker/docker-compose.yml # pom.xml # ruoyi-admin/pom.xml # ruoyi-admin/src/main/resources/application-dev.yml # ruoyi-admin/src/main/resources/application-prod.yml # ruoyi-common/pom.xml # ruoyi-demo/pom.xml # ruoyi-extend/pom.xml # ruoyi-extend/ruoyi-monitor-admin/pom.xml # ruoyi-framework/pom.xml # ruoyi-generator/pom.xml # ruoyi-generator/src/main/resources/vm/java/editBo.java.vm # ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm # ruoyi-quartz/pom.xml # ruoyi-system/pom.xml # ruoyi-ui/package.json # ruoyi-ui/src/views/index.vue		2021-07-28 10:49:16 +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 remote-tracking branch 'origin/dev'	2021-07-28 10:49:16 +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	update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具	2021-07-27 11:07:33 +08:00