Signed-off-by: xuhang <4192086292@@qq.com>
Merge branch 'master' of https://github.com/dilidili/NJU_EMS.git

Conflicts:
	nju_ems_artifact/.classpath
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/blservice/LoginBLService.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/login/loginbl/LoginContraller.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/CourseVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/LoginVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/StudentVO.class
	nju_ems_artifact/target/classes/stubforUI/LoginBlServiceStub.class
	nju_ems_artifact/target/test-classes/nju_ems_group/nju_ems_artifact/gradestest/getAnalyzeTest.class
	nju_ems_artifact/target/test-classes/nju_ems_group/nju_ems_artifact/gradestest/getRecord.class
	nju_ems_artifact/target/test-classes/nju_ems_group/nju_ems_artifact/gradestest/getSwithList.class

Signed-off-by: xuhang <4192086292@@qq.com>