Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_reissue.ftl

@@ -41,7 +41,7 @@
         </div>
         <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
         <div id="tab_demo" class="HuiTab">
-        <div class="tabBar clearfix"><span>寄回信息</span></div>
+        <div class="tabBar clearfix"><span>寄送信息</span></div>
 
         <div class="tabCon">
 
@@ -117,7 +117,7 @@
 
         <div class="row cl" id="sendLogisticsInfo" >
             <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄回信息</strong>
+                <strong>物流信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
                 <div style="width: 300px;display: inline-block;margin-right: 10px;">