Merge branch 'lyz_blstorage' of...

Merge branch 'lyz_blstorage' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

application/library/Order/OrderConfirmUtil.php

@@ -1013,7 +1013,7 @@ class OrderConfirmUtil {
         if($blGoodsList){
             $dbName = \Our\DbNameConst::masterDBConnectName;
             $pBundlingDao = \DAO\PBundlingModel::getInstance($dbName);
-            $pBundlingResult = $pBundlingDao->updateBlStorage($blGoodsList);
+            $pBundlingResult = $pBundlingDao->updateBlStorage($blGoodsList,$op);
             if(!$pBundlingResult){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::blGoodsStorageToDBFailedForOrder);
             }