From 42adea8ac8c55a282619e37c4daeecff0080ebdd Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 26 Jul 2023 13:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/user/UserRelationRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/repositories/user/UserRelationRepository.php b/app/common/repositories/user/UserRelationRepository.php
index 0ba5c8b3..1520cab2 100644
--- a/app/common/repositories/user/UserRelationRepository.php
+++ b/app/common/repositories/user/UserRelationRepository.php
@@ -106,7 +106,7 @@ class UserRelationRepository extends BaseRepository
         ];
         if($where['type'] == 10) $with = [
             'merchant' => function($query){
-                $query->where('status',1)->where('mer_state',1)->where('is_del',0)->field('mer_id,type_id,mer_name,mer_avatar,sales,mer_info,care_count,status,is_del,mer_state');
+                $query->field('mer_id,type_id,mer_name,mer_avatar,sales,mer_info,care_count,status,is_del,mer_state');
             }
         ];
         $query = $this->dao->search($where);