疯狂的狮子li 71325b540a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ...

 Conflicts:

	ruoyi-admin/src/main/resources/application-prod.yml

	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

2021-03-15 10:00:14 +08:00

..

i18n

同步升级3.0

2020-07-20 10:41:32 +08:00

META-INF

若依 3.0

2020-07-19 10:25:40 +08:00

mybatis

同步升级3.0

2020-07-20 10:41:32 +08:00

application-dev.yml

配置文件新增redis数据库索引属性

2020-12-21 11:58:49 +08:00

application-prod.yml

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

2021-03-15 10:00:14 +08:00

application.yml

update 使用hutool重写验证码生成

2021-03-12 16:52:55 +08:00

banner.txt

同步升级3.0

2020-07-20 10:41:32 +08:00

logback.xml

日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下

2020-12-09 13:37:04 +08:00