疯狂的狮子li 97873a7b2b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	pom.xml

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/components/ThemePicker/index.vue

	ruoyi-ui/src/layout/components/Settings/index.vue

	ruoyi-ui/src/store/modules/settings.js

2021-04-19 17:43:32 +08:00

..

aspectj

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

2021-04-19 17:43:32 +08:00

config

fix Feign 熔断不生效 bug

2021-04-19 17:38:47 +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

!11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象

2021-03-22 09:32:49 +08:00

security

update 删除通用工具 改为使用hutool

2021-03-15 16:38:43 +08:00

web

fix 字节转换 bug

2021-04-08 16:40:10 +08:00