fix the conflict
fix conflict
fix conflict
Merge branch 'develop'
Merge branch 'master' of https://github.com/School-of-Innovation-Experiment/provinceManagement
add student bar and info
fix title
Merge branch 'master' of https://github.com/School-of-Innovation-Experiment/provinceManagement
Merge branch 'master' of https://github.com/School-of-Innovation-Experiment/provinceManagement
Merge branch 'master' into develop