修改了总计的表格
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/out/sortList.out
	JXCSystemServer/out/sortNote.out
	JXCSystemServer/out/userList.out
	JXCSystemServer/out/user_note.out