Merge pull request #1 from haiyupeter/V2.1

V2.1
Merge pull request #2 from haiyupeter/V2.1

V2.1合并
修正错误的提示
Merge pull request #3 from haiyupeter/V2.1

V2.1合并到主干
Merge pull request #4 from haiyupeter/master

主干同步到V2.1