From 7baf7ccf34fc11c1dac6b816b5a570b412561178 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 19 Mar 2024 18:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=97=E9=93=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/system/merchant/MerchantRepository.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 6da50b6f..c9738c99 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -366,6 +366,9 @@ class MerchantRepository extends BaseRepository
         ]);
         $merchant->append(['type_name', 'isset_certificate', 'services_type']);
         $merchant['care'] = false;
+        $merchant['mer_info'] = merchantConfig($merchant['mer_id'], [
+            'mer_take_status', 'mer_take_name', 'mer_take_phone', 'mer_take_address', 'mer_take_location', 'mer_take_day', 'mer_take_time'
+        ]);
         if ($userInfo)
             $merchant['care'] = $this->getCareByUser($id, $userInfo->uid);
         return $merchant;