Merge remote-tracking branch 'origin/redesign‌-260706' into redesign‌-260706

biz-hd/custom/classes/CustomClass.php

@@ -887,7 +887,7 @@ class CustomClass extends BaseClass
         $name = $user->name ?? '';
         $mobile = $user->mobile ?? '';
         $shopId = $shop->id ?? 0;
-        $mainId = $
+        $mainId = $shop->mainId ?? 0;
         $hdAvatar = $shop->avatar ?? '';
         $sjId = $shop->sjId ?? 0;
         $sjName = $shop->merchantName ?? '';
@@ -980,6 +980,7 @@ class CustomClass extends BaseClass
                 'userId' => $userId,
                 'name' => $hdName,
                 'sjId' => $sjId,
+                'mainId' => $mainId,
                 'customId' => $customId,
                 'avatar' => $hdAvatar,
                 'py' => $hdPy,