From c8751824a8fbb0a362909c30dd7a5202a750198d Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 13 Sep 2023 14:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E6=88=B7=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=8F=91=E5=B8=83=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index d95f7c17..6038885b 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -47,7 +47,7 @@ class MerchantIntention extends BaseController
         if ($this->userInfo) $data['uid'] = $this->userInfo->uid;
         $merInfo = Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->find();
         if ($merInfo) {
-            throw new ValidateException('该用户已存在商户，不可申请');
+            //throw new ValidateException('该用户已存在商户，不可申请');
         }
         // $newUid = Db::name('User')->where('account', $data['phone'])->value('uid', -1);
         // if ($newUid != -1 && $this->userInfo->uid != $newUid) {