Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Conflicts: ruoyi-ui/package.json
4 years ago · ca5823fcdf
parent a6a9814c06 25f50d74c5
commit ca5823fcdf
1 changed files with 2 additions and 2 deletions
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -71,8 +71,8 @@
    "eslint-plugin-vue": "7.2.0",
    "lint-staged": "10.5.3",
    "runjs": "4.4.2",
-    "sass": "1.32.0",
-    "sass-loader": "10.1.0",
+    "sass": "1.32.13",
+    "sass-loader": "10.1.1",
    "script-ext-html-webpack-plugin": "2.1.5",
    "svg-sprite-loader": "5.1.1",
    "vue-template-compiler": "2.6.12"