修改了一个进货商销售商的bug
Merge remote-tracking branch 'origin/master'

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