进行了大量修改
Merge branch 'master' of git@github.com:zheniantoushipashi/Votenew.git