报错修复

app/ghs/controllers/MerchantController.php

@@ -25,11 +25,11 @@ class MerchantController extends BaseController
 	//商家信息 shish 2019.12.8
 	public function actionDetail()
 	{
-		$merchant = $this->ghs;
+		$merchant = $this->merchant;
 		if (empty($merchant)) {
 			util::success([]);
 		}
-		$merchant = MerchantService::getInfo($this->ghs, $this->merchantExtend);
+		$merchant = MerchantService::getInfo($this->merchant, $this->merchantExtend);
 		util::success($merchant);
 	}
 
@@ -90,7 +90,7 @@ class MerchantController extends BaseController
 	//商家当前的权限id列表 shish 2020.1.23
 	public function actionAuth()
 	{
-		$merchant = $this->ghs;
+		$merchant = $this->merchant;
 		$setId = $merchant['setId'];
 		$endId = 1;
 		$ids = SetAuthService::getAuthIdList($setId, $endId);