Merge pull request #1 from lhtdeg/master

qq
测试
综合
Merge pull request #2 from azui007/master

删除了一各类