From 5121dbfe7fe340cab352e874259b8c39b63a5c98 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Sep 2023 13:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=97=E9=93=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index c46beaa8..22c66a27 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -80,6 +80,7 @@ class MerchantIntention extends BaseController
             'type' => 1,
             'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''),
             'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''),
+            'mer_name' => $data['mer_name'] ?? '',
             'company_name' => $data['company_name'] ?? '',
             'organization_code' => $data['social_credit_code'] ?? '',
             'master_name' => $data['name'],
@@ -123,7 +124,6 @@ class MerchantIntention extends BaseController
             'type_name' => Db::name('merchant_type')->where('mer_type_id', $merInfo['type_id'])->value('type_name', ''),
             'category_name' => Db::name('merchant_category')->where('merchant_category_id', $merInfo['category_id'])->value('category_name', ''),
             'mer_name' => $intenInfo['mer_name'] ?? '',
-            'mer_name' => $intenInfo['mer_name'] ?? '',
             'company_name' => $intenInfo['company_name'] ?? '',
             'organization_code' => $intenInfo['social_credit_code'] ?? '',
             'master_name' => $intenInfo['name'],
@@ -212,7 +212,7 @@ class MerchantIntention extends BaseController
             'type' => 1,
             'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''),
             'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''),
-            'mer_name' => $intenInfo['mer_name'] ?? '',
+            'mer_name' => $data['mer_name'] ?? '',
             'company_name' => $data['company_name'] ?? '',
             'organization_code' => $data['social_credit_code'] ?? '',
             'master_name' => $data['name'],