1.修改bug,郭洋改的社区
Merge branch 'master' into chenxy