bug 修改
Merge branch 'master' of github.com:lcjiao/haidao