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

package.json

@@ -16,6 +16,7 @@
     "@antv/data-set": "^0.10.2",
     "@antv/data-set": "^0.10.2",
     "@tinymce/tinymce-vue": "^2.0.0",
     "@tinymce/tinymce-vue": "^2.0.0",
     "ant-design-vue": "^1.4.5",
     "ant-design-vue": "^1.4.5",
+    "antd-mobile-vue": "^0.4.0",
     "apexcharts": "^3.10.1",
     "apexcharts": "^3.10.1",
     "axios": "^0.18.0",
     "axios": "^0.18.0",
     "clipboard": "^2.0.4",
     "clipboard": "^2.0.4",