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

application/models/Business/Cart/CartService.php

@@ -391,7 +391,7 @@ class CartServiceModel extends \Business\AbstractModel{
                 return array('existCartFlag'=>\Our\ApiConst::one);
             }
             $goodsDao = \DAO\GoodsModel::getInstance(\Our\DbNameConst::masterDBConnectName);
-            $goodsValidStatus = $goodsDao->validEditCartGoods($data,$cart);
+            $goodsValidStatus = $goodsDao->validEditCartGoods($data,$cart,false);
             if(!$goodsValidStatus){
                 \Error\ErrorModel::throwException($goodsDao->errorCode);
             }