bug分支1
Merge pull request #1 from ZHENGJIANWEN/bug

bug分支1－－－好的