入住界面调整同住信息显示
Merge remote-tracking branch 'origin/master'