Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/pages/kefu/pc/components/baseHeader.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="base-header">
-    <div class="left-wrapper">
+    <div class="left-header-wrapper">
       <Input
         class="search_box"
         prefix="ios-search"
@@ -138,7 +138,7 @@ export default {
     background: linear-gradient(270deg, #1890FF 0%, #3875EA 100%);
     color #fff
     flex-shrink 0
-    .left-wrapper
+    .left-header-wrapper
         position relative
         display flex
         flex 1

template/admin/src/pages/product/productAdd/index.vue

@@ -3248,6 +3248,7 @@ export default {
 .titTip {
   display: inline-bolck;
   font-size: 12px;
+  line-height: 24px;
   font-weight: 400;
   color: #999999;
 }