物理机和虚拟机详情
Merge remote-tracking branch 'origin/master'