Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
This commit is contained in:
tony
2023-01-01 14:01:42 +08:00
9 changed files with 18 additions and 11 deletions

View File

@@ -3,9 +3,9 @@ ruoyi:
# 名称
name: RuoYi
# 版本
version: 3.8.4
version: 3.8.5
# 版权年份
copyrightYear: 2022
copyrightYear: 2023
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath