From 473314def9f6195f091848e0f88082213d59b8b2 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 21 Mar 2024 14:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E5=95=86=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index c9738c99..f8e69163 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -360,10 +360,12 @@ class MerchantRepository extends BaseRepository
      */
     public function detail($id, $userInfo)
     {
-        $merchant = $this->dao->apiGetOne($id)->hidden([
-            "real_name", "mer_phone", "reg_admin_id", "sort", "is_del", "is_audit", "is_best", "mer_state", "bank", "bank_number", "bank_name", 'update_time',
-            'financial_alipay', 'financial_bank', 'financial_wechat', 'financial_type','mer_take_phone'
-        ]);
+        $merchant = $this->dao->apiGetOne($id);
+        $merchant['info'] = $merchant->mer_info;
+//            ->hidden([
+//            "real_name", "mer_phone", "reg_admin_id", "sort", "is_del", "is_audit", "is_best", "mer_state", "bank", "bank_number", "bank_name", 'update_time',
+//            'financial_alipay', 'financial_bank', 'financial_wechat', 'financial_type','mer_take_phone'
+//        ]);
         $merchant->append(['type_name', 'isset_certificate', 'services_type']);
         $merchant['care'] = false;
         $merchant['mer_info'] = merchantConfig($merchant['mer_id'], [