id
加了注释
Merge remote-tracking branch 'origin/master'

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