|
|
@@ -39,6 +39,7 @@ class MerchantController extends BaseController
|
|
|
$name .= ' ' . $shopName;
|
|
|
}
|
|
|
$merchant['name'] = $name;
|
|
|
+ $merchant['shopInfo'] = $this->shop;
|
|
|
$ext = isset($this->sjExtend) && !empty($this->sjExtend) ? $this->sjExtend->attributes : [];
|
|
|
$merchant = MerchantService::getInfo($merchant, $ext);
|
|
|
util::success($merchant);
|
