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
This commit is contained in:
Tony
2025-04-17 06:32:26 +08:00
76 changed files with 1328 additions and 1123 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "ruoyi",
"version": "3.8.8",
"version": "3.8.9",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
@@ -55,9 +55,10 @@
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
"nprogress": "0.2.0",
"quill": "1.3.7",
"quill": "2.0.2",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
"splitpanes": "2.4.1",
"vkbeautify": "^0.99.3",
"vue": "2.6.12",
"vue-count-to": "1.0.13",
@@ -80,7 +81,6 @@
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.13",
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",