Merge branch '2.x' into dev

2020-12-14 17:07:29 +08:00
parent a33f06bb9d dc3fee12c1
commit 96204b350c
11 changed files with 29 additions and 25 deletions
@@ -68,7 +68,8 @@
  "devDependencies": {
    "@vant/cli": "^3.1.4",
    "@vue/compiler-sfc": "3.0.3",
-    "vue": "3.0.3"
+    "vue": "3.0.3",
+    "prettier": "2.1.0"
  },
  "sideEffects": [
    "es/**/style/*",