From 0b6d5e236fa096f5ccfa5f9cc2a2a587f63bdec6 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Thu, 28 Sep 2023 09:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=95=86=E6=88=B7=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/Merchant.php | 4 ++--
 app/validate/admin/MerchantValidate.php           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php
index e54de517..f37929f7 100644
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@@ -146,8 +146,8 @@ class Merchant extends BaseController
             return app('json')->fail('商户名已存在');
         if ($data['mer_phone'] && isPhone($data['mer_phone']))
             return app('json')->fail('请输入正确的手机号');
-        if (!$data['category_id'] || !$merchantCategoryRepository->exists($data['category_id']))
-            return app('json')->fail('商户分类不存在');
+        // if (!$data['category_id'] || !$merchantCategoryRepository->exists($data['category_id']))
+        //     return app('json')->fail('商户分类不存在');
 
         $newUid = Db::name('User')->where('account', $data['mer_phone'])->value('uid', -1);
         $merId  = Db::name('Merchant')->where('uid', $newUid)->value('mer_id', 0);
diff --git a/app/validate/admin/MerchantValidate.php b/app/validate/admin/MerchantValidate.php
index a3963a40..20496c4f 100644
--- a/app/validate/admin/MerchantValidate.php
+++ b/app/validate/admin/MerchantValidate.php
@@ -33,7 +33,7 @@ class MerchantValidate extends Validate
      * @var array
      */
     protected $rule = [
-        'category_id|商户分类' => 'require',
+        'category_id|商户分类' => '',
         'type_id|店铺类型' => 'integer',
         'mer_name|商户名称' => 'require|max:32',
         'mer_account|商户账号' => 'require|alphaNum|min:4|max:16',