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/src/main/java/nju_ems_group/nju_ems_artifact/gui/AdmTeaExamCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/AdmTeaFrame.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/AdmTeaShowDepPlanPanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/AdmTeaShowInfoPanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/AdmTeaTotalManagePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/DepAdmTeaDeviseCourseDetailPanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/DepAdmTeaDeviseCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/DepAdmTeaFrame.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/DepAdmTeaPlanManagePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/DepAdmTeaPublishCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/DepAdmTeaShowDepCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/JumpPanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/LoginFrame.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/StudentChooseCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/StudentFrame.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/StudentInAndOutSituationPanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/StudentQuitCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/StudentShowAllCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/StudentShowMyCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/StudentShowScoreSheetPanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/TeacherEnterScorePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/TeacherFrame.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/TeacherMakeCourseDetailPanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/TeacherMakeCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/TeacherShowCoursePanel.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/gui/TeacherShowStudentPanel.java
	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/grades/gradesdata/OP.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/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/CourseVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/FrameVO.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/MessageVO.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/UpdateRecordVO.class
	nju_ems_artifact/target/classes/nju_ems_group/nju_ems_artifact/vo/UserVO.class
	nju_ems_artifact/target/classes/stubforUI/LoginBlServiceStub.class
	nju_ems_artifact/target/classes/stubforUI/PlanBlServiceStub.class