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

application/models/Business/Cart/CartService.php

@@ -371,7 +371,7 @@ class CartServiceModel extends \Business\AbstractModel{
             if(!(isset($data['goodsNum'])&&intval($data['goodsNum'])>\Our\ApiConst::zero)){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCartBlNum);
             }
-            $this->checkBundlingGoods($pBundling,$data['goodsNum'],true);
+            $this->checkBundlingGoods($pBundling,$data['goodsNum']);
         }
         return true;
     }