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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

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

@@ -97,15 +97,17 @@
                             <tr>
                                 <#if signclosed.signclosedProductType == 1>
                                 <td>${signclosed.productName!''}</td>
-                                <td><table border="0">
-                                    <td id="tdColorId${signclosed.signclosedProductColor!''}"><input type="checkbox" checked value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">${signclosed.colorName!''}
-                                    <input type="text" style="width: 50px;margin-left: 10px;" value="${signclosed.productNum!''}" class="input-text" oninput="generateInput( ${signclosed.signclosedProductColor!''})" onpropertychange="generateInput(${signclosed.signclosedProductColor!''})"  placeholder="数量" id="alreadyColorId${signclosed.signclosedProductColor!''}" name="alreadyColorId${signclosed.signclosedProductColor!''}"><br>
-                                        <#list 1..signclosed.productNum as t>
-                                            <input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber${signclosed.signclosedProductColor!''}" >
-                                        </#list>
-
-                                    </td>
-                                </table></td>
+                                <td style="margin: 0px;padding: 0px;height: 20px;">
+                                    <table border="0">
+                                        <td id="tdColorId${signclosed.signclosedProductColor!''}" style="border-top: 1px solid #ddd;">
+                                            <input type="checkbox" checked value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">${signclosed.colorName!''}
+                                            <input type="text" style="width: 50px;margin-left: 10px;" value="${signclosed.productNum!''}" class="input-text" oninput="generateInput( ${signclosed.signclosedProductColor!''})" onpropertychange="generateInput(${signclosed.signclosedProductColor!''})"  placeholder="数量" id="alreadyColorId${signclosed.signclosedProductColor!''}" name="alreadyColorId${signclosed.signclosedProductColor!''}"><br>
+                                            <#list 1..signclosed.productNum as t>
+                                                <input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber${signclosed.signclosedProductColor!''}" >
+                                            </#list>
+                                         </td>
+                                    </table>
+                                </td>
                                 <td> </td>
                                 </#if>
                                 <#if signclosed.signclosedProductType == 2>
@@ -135,20 +137,21 @@
 
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件区域：</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal">
-                    <span class="select-box">
+                <div class="formControls col-4 col-sm-4 skin-minimal">
+                    <span class="select-box" style="width: 150px;">
                     <select name="signclosedAddrProvinces" id="province" class="select">
 
                     </select>
                      </span>
-                </div>
-                    <div class="formControls col-3 col-sm-3 skin-minimal">
-                    <span class="select-box">
+                    <span class="select-box" style="width: 150px;margin-left: 7px;">
                     <select name="signclosedAddrCity" id="city" class="select">
 
                     </select>
                     </span>
                 </div>
+                <div class="formControls col-3 col-sm-3 skin-minimal">
+
+                </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期：</label>