Merge branch 'ynpay' of D:\Dev\Project\wechat with conflicts.
gg
Merge remote-tracking branch 'origin/ynpay' into ynpay