将accountinfo和roomuseinfo的类与祥子的类合并
Merge remote-tracking branch 'origin/master'