Authored by tanling

Merge branch 'master' into dev

@@ -50,5 +50,5 @@ wechat.app.partnerid=1218934901 @@ -50,5 +50,5 @@ wechat.app.partnerid=1218934901
50 wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9 50 wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9
51 wechat.app.appid=wx049fdaa3ba9cdd7a 51 wechat.app.appid=wx049fdaa3ba9cdd7a
52 52
53 -wechat.app.newnotifyurl=${wechat.app.newnotifyurl} 53 +wechat.notifyurl=${wechat.notifyurl}
54 alipay.notifyurl=${alipay.notifyurl} 54 alipay.notifyurl=${alipay.notifyurl}