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

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

iamberry-common-tool/src/main/java/com/iamberry/wechat/tools/NameUtils.java

@@ -178,7 +178,7 @@ public class NameUtils {
 	public final static String partnerkey = "cdb9075e7ecad945ba788bc5aedM212B";// 财付通初始密码
 	public final static String charset = "UTF-8"; // 支付编码
 	public final static String KEYSTORE_FILE = "E:/apiclient_cert.p12"; // 支付API安全文件FILE位置，但是现在保存到/resource/apiclient_cert.p12
-	public final static String KEYSTORE_PASSWORD = "1240220902"; // 支付API安全文件密码
+	public final static String KEYSTORE_PASSWORD = "124022090"; // 支付API安全文件密码
 	public final static String ipAddress = "120.25.79.106"; // ip地址
 
 //	

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/pay/PayServiceImpl.java

@@ -4,6 +4,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.regex.Pattern;
 
+import com.iamberry.wechat.tools.NameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -69,7 +70,7 @@ public class PayServiceImpl implements PayService {
 			return payResult;
 		}
 		Object object = wxPayUtil.getPackage(openid, orderId, money,
-				ip, reqPayGoodsName, wxPayUtil.appid, backUrl);
+				ip, reqPayGoodsName, NameUtils.appId, backUrl);
 		if (object.getClass() == String.class) {
 			payResult.setPaySuccess(true);
 			payResult.setPayData(object.toString());

iamberry-wechat-web/src/main/resources/wx_public_no.properties

@@ -6,5 +6,5 @@ partner=1321590501
 partnerkey=cdb9075e7ecad945ba788bc5aedM212B
 charset=UTF-8
 KEYSTORE_FILE=E:/apiclient_cert.p12
-KEYSTORE_PASSWORD=1240220902
+KEYSTORE_PASSWORD=124022090
 ipAddress=120.25.79.106

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

@@ -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;'+