Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Allot.php

@@ -752,7 +752,7 @@ public function vesio(){
                     Db::rollback();
                     return error_show(1004, "验货更新失败");
                 }
-                $stoup =GoodStockInfo::bnStock($stock['id'],$p['bnCode'],$p['allot_num'],0,$p['origin_price']);
+                $stoup =GoodStockInfo::bnStock($stock['id'],$p['bnCode'],$p['stock_num'],0,$p['origin_price']);
                 if($stoup==false){
                 	Db::rollback();
                     return error_show(1002,"bn库存数修改失败");