From f5681d5b747c3cae2c573a908760d419082295a3 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 12 Mar 2024 18:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantIntentionRepository.php            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
index e86a2671..f5cfb06f 100644
--- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php
+++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
@@ -192,7 +192,8 @@ class MerchantIntentionRepository extends BaseRepository
                     }
                     $data['mer_id'] = $merchant->mer_id;
                     $data['uid'] = $intention['uid'];
-                    $data['reg_admin_id'] = $autoCreate ? 0: $merchant['merchant_admin']['merchant_admin_id'];
+//                    $data['reg_admin_id'] = $autoCreate ? 0: $merchant['merchant_admin']['merchant_admin_id'];
+                    $data['reg_admin_id'] = $autoCreate ? 0: $merchant->reg_admin_id;
                     //写入商户客服表
                     $store_service_data['mer_id'] = $merchant->mer_id;
                     $store_service_data['uid'] = $intention['uid'];