修改showview的显示
Merge remote-tracking branch 'origin/master'
合并origin/master