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

@@ -139,7 +139,6 @@
                     <span class="select-box">
                     <select name="signclosedAddrProvinces" id="province" class="select">
 
-
                     </select>
                      </span>
                 </div>
@@ -147,7 +146,6 @@
                     <span class="select-box">
                     <select name="signclosedAddrCity" id="city" class="select">
 
-
                     </select>
                     </span>
                 </div>
@@ -250,8 +248,8 @@
                         if(value.fittingsList != null) {
                             if (value.fittingsList.length > 0) {
                                 $.each(value.fittingsList, function (i, value) {
-                                    fittingsTable = fittingsTable + '<input type="checkbox" value="' + value.fittingsId + '" name="alreadyFittingsName" datatype="*">' + value.fittingsName + ''
-                                            + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="alreadyFittingsId' + value.fittingsId + '" name="alreadyFittingsId' + value.fittingsId + '"><br>'
+                                    fittingsTable = fittingsTable + '<input type="checkbox" style="margin-left: 5px;" value="' + value.fittingsId + '" name="alreadyFittingsName" datatype="*">' + value.fittingsName + ''
+                                            + '<input type="text" style="width: 50px;" class="input-text" value="" placeholder="数量" id="alreadyFittingsId' + value.fittingsId + '" name="alreadyFittingsId' + value.fittingsId + '"><br>'
                                 });
                             }else{
                                 fittingsTable = '<span>暂无配件，请先添加配件</span>';