Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-hd/controllers/ProductController.php

@@ -128,6 +128,7 @@ class ProductController extends BaseController
             } else {
                 $ghs = GhsClass::getGhsInfo($id);
                 $sjId = $ghs['sjId'] ?? 0;
+                $shopId = $ghs['shopId'] ?? 0;
             }
             $transaction->commit();
 

biz-ghs/custom/classes/CustomClass.php

@@ -146,7 +146,7 @@ class CustomClass extends BaseClass
             return $list;
         }
         //获取客户信息
-        $customSjIdList = array_unique(array_filter(array_column($list, 'customSjId')));
+        $customSjIdList = array_unique(array_filter(array_column($list, 'sjId')));
         $sjInfo = MerchantClass::getByIds($customSjIdList, null, 'id');
         foreach ($list as $key => $val) {
             $customSjId = $val['customSjId'];