草稿单
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/fkdNote.out
	JXCSystemServer/receiptList.out
	JXCSystemServer/skdNote.out