修改微信调用controller错误
Merge remote-tracking branch 'origin/master'