Merge remote-tracking branch 'origin/master' into referMaster

src/common/components/EditableSpan/index.less

@@ -5,7 +5,7 @@
   word-break: break-word;
   min-width: 10px;
   // line-height: 2;
-  height: 16px;//火狐需要
+  min-height: 16px;//火狐需要
   line-height: 16px;
   vertical-align: middle;
   text-align: left;