Merge branch 'master' of D:\java-IDEA\7\school-center-ui with conflicts.

4eb469b6 · 黄森林 · 66746c56 · 4eb469b6 · 4eb469b6
Commit 4eb469b6 authored Feb 24, 2020 by 黄森林
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

package.json
+1 -0

yarn.lock
+0 -0

No files found.
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
    "@antv/data-set": "^0.10.2",
    "@tinymce/tinymce-vue": "^2.0.0",
    "ant-design-vue": "^1.4.5",
+    "antd-mobile-vue": "^0.4.0",
    "apexcharts": "^3.10.1",
    "axios": "^0.18.0",
    "clipboard": "^2.0.4",

--- a/yarn.lock
+++ b/yarn.lock