Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/App.vue

@@ -66,9 +66,8 @@ export default {
 <style>
 @import "./assets/css/tablevoerride.css";
 @import "./assets/global/font.css";
-@import "//at.alicdn.com/t/font_1627123_xio004ni8y.css";
+@import "//at.alicdn.com/t/font_1627123_y721eyx4nxs.css";
 @import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
-@import url("//at.alicdn.com/t/font_635492_63x5920i6sn.css");
 /* @import './assets/css/common.css'; */
 
 @import "./assets/css/init.css";