增加日志显示后台支持
Merge remote-tracking branch 'origin/master'