添加了UserInfoVO
修改了login.java：添加了getUserInfo（），getUser()返回值修改为UserInfoVO
addUser（）参数改为UserInfoVO
Merge branch 'master' of https://github.com/dilidili/NJU_EMS.git

Conflicts:
	nju_ems_artifact/data/logindata/logindata.txt