Merge branch 'redesign‌-260706' into dev

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 ?? '';