From 341728669ec73be638d31755bececef51bba112f Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Mon, 21 Nov 2022 22:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Common/Common/extend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 50fc456e..b74714b8 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -2001,7 +2001,7 @@ function getMasterPaymentMerchant($way)
     $conditions['_string'] = 'ways&' . $way . '=' . $way;
     $conditions['status'] = 1;
     $conditions['is_master'] = 1;
-    return M('payment_merchant', 'tab_')->where($conditions)->select();
+    return M('payment_merchant', 'tab_')->where($conditions)->find();
 }
 
 function checkIsUserMasterMerchant($baseGame, $userId, $payAmount)