account
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

Conflicts:
	JXCSystemServer/customerList.out