修改了LoginBlService：  添加了addUser方法，setUser方法
更新本地代码库
解决冲突
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/LoginBLService.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/login/loginbl/Login.java
	nju_ems_artifact/src/main/java/nju_ems_group/nju_ems_artifact/plan/planbl/plan.java
	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/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/plan/planbl/plan.class