From 4be643e08b9902292fb88f4c572f9dda4948a781 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 9 Sep 2023 11:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=AA=8C=E8=AF=81=E5=95=86?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/Merchant.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php
index 4efab1d6..cb184416 100644
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@@ -102,7 +102,7 @@ class Merchant extends BaseController
         if (!empty($data['mer_phone'])) {
             $newUid = Db::name('User')->where('account', $data['mer_phone'])->value('uid', 0);
             if ($newUid) {
-                return app('json')->fail('该商家手机号已存在账户，请更换手机');
+                //return app('json')->fail('该商家手机号已存在账户，请更换手机');
             }
         }
         $this->repository->createMerchant($data);
@@ -152,7 +152,7 @@ class Merchant extends BaseController
         $newUid = Db::name('User')->where('account', $data['mer_phone'])->value('uid', -1);
         $merId  = Db::name('Merchant')->where('uid', $newUid)->value('mer_id', 0);
         if ($newUid != -1 && $id != $merId) {
-            return app('json')->fail('该商家手机号已存在账户，请更换手机');
+            //return app('json')->fail('该商家手机号已存在账户，请更换手机');
         }
         unset($data['mer_account'], $data['mer_password']);
         $margin = $this->repository->checkMargin($id, $data['type_id']);