From 8a6564d3f8a36e7392a9e0b0b28308a3ecdc6207 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 11 Apr 2024 17:55:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=97=B6?=
 =?UTF-8?q?=20=20=E5=8F=AA=E8=83=BD=E6=9F=A5=E8=AF=A2=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/system/merchant/MerchantDao.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/common/dao/system/merchant/MerchantDao.php b/app/common/dao/system/merchant/MerchantDao.php
index a2bc7e7..ed89dd3 100644
--- a/app/common/dao/system/merchant/MerchantDao.php
+++ b/app/common/dao/system/merchant/MerchantDao.php
@@ -38,7 +38,6 @@ class MerchantDao extends BaseDao
     public function search(array $where, $is_del = 0)
     {
         $merchantType = $where['merchant_type'] ?? 0;
-        $merchantType = in_array((int)$merchantType,[0,1,2,3]) ? $merchantType : 0;// 类型非法，使用默认类型
 
         $query = Merchant::getDB()
             ->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {