修改了进货销售的界面
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/sortList.out