merchantId

app/shop/controllers/AuthController.php

@@ -161,7 +161,7 @@ class AuthController extends PublicController
         }
         //获取token
         $token = jwt::getNewToken($adminId);
-        util::success(['token' => $token, 'account' => $merchantId, 'merchantId' => $admin['merchantId']]);
+        util::success(['token' => $token, 'account' => $merchantId, 'merchantId' => $merchantId]);
     }
 
     //静默获取小程序用户信息