小修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemClient/src/main/java/ui/account/payRe/AddPaymentPanel.java
	JXCSystemServer/accountList.out
	JXCSystemServer/comNote.out
	JXCSystemServer/customerList.out
	JXCSystemServer/fkdNote.out
	JXCSystemServer/khbhNote.out
	JXCSystemServer/skdNote.out
	JXCSystemServer/sortList.out