Authored by tanling

Merge branch 'master' into dev

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