修改了一些问题，草稿单还没改
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/out/allBillList.out
	JXCSystemServer/out/customerList.out
	JXCSystemServer/out/exportList.out
	JXCSystemServer/out/importList.out
	JXCSystemServer/out/invoiceList.out
	JXCSystemServer/out/jhdNote.out
	JXCSystemServer/out/operatingConditionList.out
	JXCSystemServer/out/sortList.out
	JXCSystemServer/out/systemlogList.out
	JXCSystemServer/out/userList.out
	JXCSystemServer/out/user_note.out