修改了view的margin
Merge branch 'master' of https://github.com/Dianjoy/jokes.git
修改了view的margin