Merge remote-tracking branch 'refs/remotes/ruoyi/master'

# Conflicts: # README.md # pom.xml # ruoyi-ui/package.json # ruoyi-ui/src/views/index.vue # ruoyi-ui/vue.config.js
2025-04-17 06:32:26 +08:00
parent 301bfac904 11fed08b56
commit 94eb038184
76 changed files with 1328 additions and 1123 deletions
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,9 +3,9 @@ ruoyi:
  # 名称
  name: RuoYi
  # 版本
-  version: 3.8.8
+  version: 3.8.9
  # 版权年份
-  copyrightYear: 2024
+  copyrightYear: 2025
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  profile: D:/ruoyi/uploadPath
  # 获取ip地址开关