商家信息

app/client/controllers/MerchantController.php

@@ -23,10 +23,10 @@ class MerchantController extends BaseController
 	//当前用户获取商家信息
 	public function actionGetInfo()
 	{
-		$merchant = $this->merchant;
+		$merchant = MerchantService::getInfo($this->merchant, $this->merchantExtend);
 		util::success($merchant);
 	}
-	
+
 	//客户的会员等级 shish 2020.1.2
 	public function actionUserGrade()
 	{