修复投票选项不能显示
Merge remote-tracking branch 'origin/master'