Merge branch 'release/shop_supplier_v' into release/1.6

-{{# headerTab}}
+<!-- {{# headerTab}}
 <div class="tabheader">
     <ul class="nav nav-tabs">
       <li {{# changePrice}}class="active"{{/ changePrice}}><a href="/goods/pricechange/index">代销变价</a></li>
       <li {{# brandCooperation}}class="active"{{/ brandCooperation}}><a href="/goods/brandCooperation/index">品牌合作模式设置</a></li>
     </ul>
 </div>
-{{/ headerTab}}
+{{/ headerTab}} -->
 
 
 <div class="pageheader">