Merge branch 'master' into dev

biz-ghs/product/classes/ProductClass.php

@@ -519,8 +519,7 @@ class ProductClass extends BaseClass
                 $list[$k]['skPrice'] = floatval($v['skDiscountPrice']);
             }
             $list[$k]['price'] = $price;
-
-            $cost = $v['cost'] ?? 0;
+            $cost = $v['avCost'] ?? 0;
             $ml = 0;
             if ($price > 0) {
                 $profit = bcsub($price, $cost, 2);