Merge remote-tracking branch 'origin/developer' into developer

src/main/resources/static/css/supplier-login/login.css

@@ -224,7 +224,6 @@ body{
     font-size: 1.2vw;
     font-weight: 400;
     color: #272727;
-    margin-left: 10px;
 }
 .header_link{
     align-items: center;

src/main/resources/templates/article/components/article-drawer.html

@@ -31,7 +31,7 @@
     </div>
     <div class="hot-recommend" th:if="${#arrays.length(productSellNumbers)} > 0">
       <div class="hot-recommend-title">
-        <div>你可能感兴趣的商品</div>
+        <div>您可能感兴趣的商品</div>
         <div>
           <a href="/product/list.html">更多 ></a>
         </div>

src/main/resources/templates/article/components/article-sidebar.html

@@ -28,7 +28,7 @@
         </div>
         <div v-if="isPC" class="recommend" th:if="${#arrays.length(productSellNumbers)} > 0">
             <p class="classify readerSify">
-                你可能感兴趣的商品
+                您可能感兴趣的商品
                 <span class="more-product">
 <!--                <span v-if="recommend.nextPage" class="next" @click="getRecommend(typeId, recommend.nextPage)"></span>-->
                     <!--                <span v-if="recommend.prePage" class="pre" @click="getRecommend(typeId, recommend.prePage)"></span>-->

src/main/resources/templates/supplier_login/index.html

@@ -32,7 +32,7 @@
         <div class="login_header_container">
             <div class="img_logo" @click="goToIndex">
                 <div class="logo" style="background-size: contain"></div>
-                <div class="text">美业参谋</div>
+                <div class="text" style="margin-left: 10px;">美业参谋</div>
             </div>
             <div class="header_link" v-cloak>
                 <a ref="link_item" @click="H5link(item)" class="header_link_itme" :class="activeLinkId === item.id ? 'isActiveLink' : ''" v-for="item in activeLinks" :key="item.id">

src/main/resources/templates/supplier_login/supplier_head.html

@@ -28,7 +28,7 @@
     <div class="login_header_container">
       <div class="img_logo" @click="goToIndex">
         <div class="logo" style="background-size: contain"></div>
-        <div class="text">美业参谋</div>
+        <div class="text" style="margin-left: 10px;">美业参谋</div>
       </div>
       <div class="header_link" v-cloak>
         <a ref="link_item" @click="H5link(item)" class="header_link_itme" :class="activeLinkId === item.id ? 'isActiveLink' : ''" v-for="item in activeLinks" :key="item.id">