修改：bug，酒令没有存roomId
Merge remote-tracking branch 'origin/master'