solve conflict
solve conflict
Merge branch 'master' of https://github.com/dilidili/NJU_EMS.git

Conflicts:
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/blservice/GradesBLService.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/grades/gradesbl/GradesController.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/grades/gradesdata/DataGrades.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/pick/pickdata/PickData.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/DepartmentVO.class