解决统计页面冲突
Merge branch 'master' of https://github.com/zhouda-genee/project.git