Merge branch 'master' of http://114.215.101.231:8099/root/chengxiang

@@ -891,7 +891,7 @@
   }
 }
 .toolbar .toolbar-inner {
-  height: 1.2rem;
+  height: 2.2rem;
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;