类名修改，去掉前缀，更精简
Merge remote-tracking branch 'origin/master'