|
|
@@ -25,7 +25,7 @@ class PublicController extends baseController
|
|
|
$account = isset($header['account']) ? $header['account'] : 0;
|
|
|
if (!empty($account)) {
|
|
|
$this->merchantId = $account;
|
|
|
- $merchant = MerchantService::getMerchantById($account);
|
|
|
+ $this->merchant = MerchantService::getMerchantById($account);
|
|
|
}
|
|
|
return parent::beforeAction($action);
|
|
|
}
|