Merge branch 'lyz' of git.shenbd.com:qm-develop/shenbd into master_dev

application/models/DAO/PBundling.php

@@ -198,7 +198,7 @@ class PBundlingModel extends \DAO\AbstractModel {
             $pBundling['bl_storage'] = $pBundling['bl_storage']-$blStorage;
             if($pBundling['bl_storage']-$blStorage<\Our\ApiConst::zero){
                 \Lock\RedisLock::getInstance()->releaseLock(\Our\NameConst::pBundlingStorageRedisPrefix.$blId);
-                \Error\ErrorModel::throwException(\Our\CodeConfigModel::pBundlingNoStorageForOrder);
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::pBundlingNoStorageForOrder);
             }
             $pBundling['bl_origin_storage'] = $pBundling['bl_origin_storage']-$blStorage;
         }else if($op == \Our\ApiConst::plus){