Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

# Conflicts:
#	vue.config.js

jsconfig.json

@@ -3,9 +3,16 @@
     "target": "es6",
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": [
+        "src/*"
+      ]
     }
   },
-  "exclude": ["node_modules", "dist"],
+  "exclude": [
-  "include": ["src/**/*"]
+    "node_modules",
-}
+    "dist"
+  ],
+  "include": [
+    "src/**/*"
+  ]
+}