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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

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

@@ -372,7 +372,7 @@
                         }
                         var visitText = "";
                         if(customer.visitStatus == 1){
-                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.adminName)+'</span>)&nbsp;&nbsp;'+
                                     '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
                                     '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
                                     convertUndefinedToEmpty(customer.visitName)+'&nbsp;&nbsp;'+
@@ -380,7 +380,7 @@
 
                     }
                         if(customer.visitStatus == 2){
-                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.adminName)+'</span>)&nbsp;&nbsp;'+
                                     '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
                                     '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
                                     convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+