修改和新增正常入库和商品领用
Merge branch 'master' of https://github.com/longxulanwws/cm.git