From b42b0661cee82f31d74f1f68818eb617b665dbe4 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 16 May 2023 18:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=95=86=E6=88=B7=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=B5=84=E8=B4=A8=E5=B1=95=E7=A4=BA=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/merchant/system/Merchant.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controller/merchant/system/Merchant.php b/app/controller/merchant/system/Merchant.php
index 7a30d73f..4f3af27e 100644
--- a/app/controller/merchant/system/Merchant.php
+++ b/app/controller/merchant/system/Merchant.php
@@ -147,6 +147,9 @@ class Merchant extends BaseController
         $delivery = $repository->get($this->request->merId()) + systemConfig(['tx_map_key']);
         $data = array_merge($data,$delivery);
         $data['sys_bases_status'] = systemConfig('sys_bases_status') === '0' ? 0 : 1;
+        if (!empty($data['mer_certificate']) && !is_array($data['mer_certificate'])) {
+            $data['mer_certificate'] = explode(',', $data['mer_certificate']);
+        }
 
         return app('json')->success($data);
     }