web/package.json
@@ -17,6 +17,7 @@ }, "devDependencies": { "node-sass": "^4.14.0", "sass": "^1.95.1", "sass-loader": "^8.0.2" }, "author": "uView", @@ -28,7 +29,11 @@ "通用组件" ] }, <<<<<<< HEAD "dependencies": { "uview-ui": "^2.0.38" } ======= "dependencies": {} >>>>>>> eb14fddff37f3783c63deba20f53b37383fba652 }