Merge remote-tracking branch 'origin/master'

src/main/resources/payConfig.properties

@@ -21,4 +21,4 @@ yee-pay.platformServiceNo = 10086160165
 yee-pay.merchantNo = 10086226651
 
 #充值回调地址
-yee-pay.rechargeReturnUrl = https://vote.guosen-fumao.cn
+yee-pay.rechargeReturnUrl = http://myway.zicp.vip:47620