Merge branch 'master' into dev

biz-ghs/product/classes/ProductClass.php

@@ -642,8 +642,6 @@ class ProductClass extends BaseClass
             //今日特价、会员价
             $price = self::getFinalPrice($v, $level, $priceMap, $addPriceMap);
 
-
-
             $list[$k]['price'] = $price;
             $list[$k]['bigPrice'] = $price;
             $smallRatio = $v['smallRatio'] ?? 0;