From 02cd35c95f53821570ebe197d3dc8257cf89c067 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 6 Feb 2024 10:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8B=9B=E5=95=86=E5=91=98=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/system/merchant/MerchantRepository.php       | 4 +++-
 app/controller/admin/system/merchant/Merchant.php             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 2a56684..23a43da 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -829,7 +829,9 @@ class MerchantRepository extends BaseRepository
      */
     public function adminDetail($id)
     {
-        $data = $this->dao->getWhere(['mer_id' => $id],'*',['merchantType','merchantCategory'])->toArray();
+        $data = $this->dao->getWhere(['mer_id' => $id],'*',['merchantType','merchantCategory',    'spread' => function ($query) {
+            $query->field('uid,nickname,avatar');
+        }])->toArray();
         $make = app()->make(MerchantAdminRepository::class);
         $data['mer_account'] = $make->merIdByAccount($id);
         $data['mer_password'] = '***********';
diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php
index bd4e56f..2fed486 100644
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@@ -209,6 +209,7 @@ class Merchant extends BaseController
             ['platform_commission',0],
             ['avg_consumption',0],
             'mer_label',
+            'spread_uid'
         ]);
         $data['mer_label'] = str_replace('，',',',$data['mer_label']);
         if (!$isUpdate) {