merge comflict
change db ip
merge conflict
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
add recommandrate to a model
add dlut major dict
import school from setting in const
add dlut major
Merge branch 'school_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school_dev_beta
fix setting
fix school setting