滚粗

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

Conflicts:
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/blservice/CourseBLService.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/vo/LoginVO.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/vo/StudentVO.java
	nju_ems_artifact/src/main/java/stubforUI/CourseBLServiceStub.java
	nju_ems_artifact/src/main/java/stubforUI/LoginBlServiceStub.java
	nju_ems_artifact/src/main/java/stubforUI/PlanBlServiceStub.java
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/blservice/CourseBLService.class
	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/blservice/LoginBLService.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/blservice/PlanBLService.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/course/coursebl/Course.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/grades/gradesbl/AnalyzeItem.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/grades/gradesbl/Grades.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/gradesbl/SwithItem.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/login/loginbl/Login.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/login/logindata/LoginControlData.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/pick/pickbl/pick.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/plan/planbl/plan.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/plan/plandata/PlanData.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/AnalyzeVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/CourseInfoVO.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/ReviewItemInfoVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/ReviewItemVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/StudentVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/SwithListVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/TeachingPlanVO.class
	nju_ems_artifact/target/classes/stubforUI/CourseBLServiceStub.class
	nju_ems_artifact/target/classes/stubforUI/GradesBLServiceStub.class
	nju_ems_artifact/target/classes/stubforUI/LoginBlServiceStub.class
	nju_ems_artifact/target/classes/stubforUI/PlanBlServiceStub.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/getSwithList.class
	nju_ems_artifact/target/test-classes/nju_ems_group/nju_ems_artifact/logintest/LoginBlTest1.class

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