//求证
Merge remote-tracking branch 'origin'
//添加了视图