modified name
solve confilcts
fix analysis bugs
Merge branch 'develop'
Merge branch 'master' of https://github.com/School-of-Innovation-Experiment/provinceManagement