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) {