改成了自动停的
Merge remote-tracking branch 'origin/master'