Merge remote-tracking branch 'ruoyi/master'

# Conflicts:
#	README.md
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
This commit is contained in:
tony
2024-03-12 08:10:01 +08:00
21 changed files with 193 additions and 48 deletions

View File

@@ -5,7 +5,7 @@ ruoyi:
# 版本
version: 3.8.7
# 版权年份
copyrightYear: 2023
copyrightYear: 2024
# 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath
profile: D:/ruoyi/uploadPath
# 获取ip地址开关