修改了user的返回
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/out/userList.out
	JXCSystemServer/out/user_note.out
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem