Merge branch 'variant' of http://gogs.hnwmzp.cn/chengwenliang/nshop into variant

packages/Longyi/Core/src/Type/FlexibleVariant.php

@@ -209,7 +209,8 @@ class FlexibleVariant extends AbstractType
 
     public function isSaleable(): bool
     {
-        return $this->getSaleableVariants()->isNotEmpty();
+        // return $this->getSaleableVariants()->isNotEmpty()&&parent::isSaleable();
+        return parent::isSaleable();
     }
 
     /**