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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/update_sender.ftl

@@ -52,7 +52,7 @@
             <#--</div>-->
             <div class="row cl">
                 <label class=" col-3 col-sm-3 huanhang" style="text-align: right;">寄件人姓名：</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                         <span>
                             ${complaintSignclosedInfo.signclosedSendName!''}
                         </span>
@@ -60,7 +60,7 @@
             </div>
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人电话：</label>
-                <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                         <span>
                         ${complaintSignclosedInfo.signclosedSendTel!''}
                         </span>
@@ -68,7 +68,7 @@
             </div>
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">物流公司：</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                         <span>
                             <#if complaintSignclosedInfo.signclosedLogistics??>
                             <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
@@ -91,7 +91,7 @@
 
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">物流单号：</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                         <span>
                         <#if complaintSignclosedInfo.signclosedLogisticsNumber??>
                             ${complaintSignclosedInfo.signclosedLogisticsNumber!''}