refactor vote
Merge pull request #20 from tuoxiaozhong/txz

Txz
update merge
resolve confict