Commit Graph

6 Commits

Author SHA1 Message Date
Chuanjian Lai 32a8f7effb Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
#	sql/ry_config_20210128.sql
2021-02-22 14:59:55 +08:00
RuoYi 0dcc955ced 更换过期的共享配置属性 2021-01-27 18:00:50 +08:00
JuJu 24fb0b712a 删除无用代码 2020-10-26 15:39:36 +08:00
RuoYi d52f6673bc 调整日志路径到模块目录 2020-10-13 17:36:00 +08:00
Chuanjian Lai 42d3a9be42 修改配置信息 2020-07-27 09:05:16 +08:00
RuoYi 3da7aea540 若依 1.0 2020-05-24 20:40:55 +08:00