add funtion:add choice on subject_rating on adminstaff page
Merge branch 'school_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school_dev_beta
fix school server
little change
fix adminstaff bug
fix conflict
fix conflict
add the project view
修改结题报告bug
fixed conflict
修改项目显示页面
Merge branch 'school_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school_dev_beta
debug
go
flex
Merge branch 'school_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school_dev_beta
Merge branch 'school_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into school_dev_beta
merge the school_dev