Merge pull request '修改' (#43) from feature/GamePaymentRule into master

Reviewed-on: http://8.136.139.249:3000/wmtx/sdk/pulls/43
2 years ago · 4b0bee4cd2
parent a9c39eb719 341728669e
commit 4b0bee4cd2
1 changed files with 1 additions and 1 deletions
--- 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)