收付款小问题
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/out/customerList.out
	JXCSystemServer/out/fkdNote.out
	JXCSystemServer/out/invoiceList.out
	JXCSystemServer/out/khbhNote.out
	JXCSystemServer/out/paymentList.out
	JXCSystemServer/out/skdNote.out