修改了销售单编号等一些小问题
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/out/khbhNote.out
	JXCSystemServer/out/systemlogList.out