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/customer/custome_list.ftl

@@ -334,7 +334,7 @@
      * 进入添加回访页面
      */
     function toAddVisit(customerId) {
-        layer_show("客诉回访","${path}/admin/customer/_add_visit?customerId="+customerId,"800","500");
+        layer_show("客诉回访","${path}/admin/customer/_add_visit?customerId="+customerId,"780","500");
     }
 
     /**

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

@@ -159,8 +159,6 @@
 
 
 
-
-
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少配件：</label>
                 <div class="formControls col-5 col-sm-5 skin-minimal">
@@ -177,7 +175,7 @@
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
-                   <input type="text" style="margin-left: 10px;" class="input-text my-input-date Wdate" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
+                   <input type="text" style="" class="input-text my-input-date Wdate" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
                 </div>
             </div>