Merge branch 'hz_master' into base-modify

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXPay.java

@@ -67,7 +67,7 @@ public class WXPay {
 		String jsParam = "";
 		if (prepayid != null && prepayid.length() > 10) {
 			// 生成微信支付参数，此处拼接为完整的JSON格式，符合支付调起传入格式
-			jsParam = WXPay.createPackageValueWeb(SystemConfig.WINXIN_AppID, SystemConfig.WINXIN_PARTNER_KEY, prepayid);
+			jsParam = WXPay.createPackageValueWeb(wyAppid, SystemConfig.WINXIN_PARTNER_KEY, prepayid);
 		
 		}
 		return jsParam;