Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -73,7 +73,7 @@ ali.sms.msg.code=SMS_212320165
 ali.cdn.url=
 
 #微信公众域名
-wechat.mp.url=https://fw.greeapps.com/
+wechat.mp.url=https://fw.greeapps.com/jsm-h5
 
 #通联支付回调地址
 allIn.payment.notifyUrl=${sys.url}/zfdminiapp/pay/allinpay/callback