添加了一些类
Merge remote-tracking branch 'origin/master'