Merge remote-tracking branch 'ruoyi/master'

# Conflicts: # README.md # ruoyi-ui/package.json # ruoyi-ui/src/utils/index.js # ruoyi-ui/src/views/index.vue
2023-12-12 16:16:57 +08:00
parent e41d99e6aa 36b900cef8
commit 7752a502ac
54 changed files with 1116 additions and 1129 deletions
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,11 +3,9 @@ ruoyi:
  # 名称
  name: RuoYi
  # 版本
-  version: 3.8.6
+  version: 3.8.7
  # 版权年份
  copyrightYear: 2023
-  # 实例演示开关
-  demoEnabled: true
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  profile: D:/ruoyi/uploadPath
  # 获取ip地址开关