Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/models/store/StoreCart.php

@@ -310,9 +310,6 @@ class StoreCart extends BaseModel
             }
         }
         foreach ($valid as $k => $cart) {
-            if ($only_store_user && !($cart['productInfo']['only_store_user'] ?? 0)) {
-                return self::setErrorInfo('采购商品不可和其他商品一起结算');
-            }
             if ($cart['trueStock'] < $cart['cart_num']) {
                 $cart['cart_num'] = $cart['trueStock'];
                 $model->where('id', $cart['id'])->update(['cart_num' => $cart['cart_num']]);