From ed150967351c96303d2381c6b0c5ae4e7f23bfe3 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Sat, 9 Sep 2023 11:32:17 +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=E6=89=8B=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index b17cbaa1..3a8383ad 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -47,11 +47,11 @@ class MerchantIntention extends BaseController
         if ($this->userInfo) $data['uid'] = $this->userInfo->uid;
         $newUid = Db::name('User')->where('account', $data['phone'])->value('uid', -1);
         if ($newUid != -1 && $this->userInfo->uid != $newUid) {
-            throw new ValidateException('该申请手机已存在账户，不可申请');
+            //throw new ValidateException('该申请手机已存在账户，不可申请');
         }
         $newMerid = Db::name('Merchant')->where('mer_phone', $data['phone'])->value('mer_id', -1);
         if ($newMerid != -1) {
-            throw new ValidateException('该申请手机已存在商户，不可申请');
+            //throw new ValidateException('该申请手机已存在商户，不可申请');
         }
         $make = app()->make(MerchantRepository::class);
         if ($make->fieldExists('mer_name', $data['mer_name']))