强转AllBillVO  库存报溢报损添加了一个表格
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemServer/out/customerList.out
	JXCSystemServer/out/userList.out
	JXCSystemServer/out/user_note.out