单据审批和查看相应跳转运行ok，
还有这些
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/comNote.out
	JXCSystemServer/sortList.out