添加一个常用辅助类
Merge remote-tracking branch 'origin/master'