merge comflict
delete minzu logo
change db ip
merge conflict
Merge branch 'minzu' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school
Merge branch 'school' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school
Merge branch 'school' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school
Merge branch 'school' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school
Merge branch 'school' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school
fix school database
Merge branch 'school' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school
fix run.sh
fix homepage
Merge branch 'school_dev_beta' into school
fxi deploy server bug
fix deploy server error
Merge branch 'school_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school_dev_beta
add display for recommend ratio
Merge branch 'school_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school_dev_beta
add auto recommend rate setting function