调整采购订单和采购入库的细节，表结构主要调整编码的命名
Merge branch 'master' of https://github.com/ebspos/ebspos

Conflicts:
	src/com/ebspos/ckjh/controller/CkjhcheckController.java
	src/com/ebspos/controller/JbsupplierController.java