修改了一些bug
Merge branch 'master' of https://github.com/amsDevelop/collaboration_team