修改了一点数据层
Merge remote-tracking branch 'origin/master'

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