修改了销售商什么的下拉框
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/jhdNote.out