修复几个bug
Merge remote-tracking branch 'origin/master'
和fj合并master