From 479c7fc6a36dcece734df4b0032ad2761a8bfd3b Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 9 Jun 2023 15:16:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantRepository.php           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 79315a36..07ac937c 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -324,12 +324,12 @@ class MerchantRepository extends BaseRepository
                     }
                     $item['distance'] = $distance;
                 }
-                if(isset($where['type_id'])&& $where['type_id']==12){
-                    $item['recommend'] =  $item['AllRecommendType'];
-                }else{
-                    $item['recommend'] = isset($where['delivery_way']) ? $item['CityRecommend'] : $item['AllRecommend'];
-
-                }
+//                if(isset($where['type_id'])&& $where['type_id']==12){
+//                    $item['recommend'] =  $item['AllRecommendType'];
+//                }else{
+//                    $item['recommend'] = isset($where['delivery_way']) ? $item['CityRecommend'] : $item['AllRecommend'];
+//
+//                }
                 return  $item;
             });