Merge remote-tracking branch 'origin/master'

# Conflicts: # README.md # ruoyi-ui/package.json # ruoyi-ui/src/views/index.vue
2023-01-01 14:01:42 +08:00
parent c1b786e0e8 c3a727b2fd
commit eddbeefb40
9 changed files with 18 additions and 11 deletions
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ruoyi",
-  "version": "3.8.4",
+  "version": "3.8.5",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",