继续修改物理机详情tab
Merge remote-tracking branch 'origin/master'