From 73fd8c994110433cfe7e313c6180536e5b1cb0b6 Mon Sep 17 00:00:00 2001
From: topnuomi <1130395124@qq.com>
Date: Sat, 30 May 2020 01:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B4=A2=E5=BC=95=E6=97=B6merge=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=9A=E9=87=8D=E7=BD=AE=E9=85=8D=E7=BD=AE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/library/Config.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/library/Config.php b/framework/library/Config.php
index 014249c..6b1ade5 100644
--- a/framework/library/Config.php
+++ b/framework/library/Config.php
@@ -61,7 +61,9 @@ class Config
                     // 合并配置项
                     foreach ($config as $key => $value) {
                         if (array_key_exists($key, $this->config) && is_array($value)) {
-                            $this->config[$key] = array_merge($this->config[$key], $value);
+                            foreach ($value as $k => $v) {
+                                $this->config[$key][$k] = $v;
+                            }
                         } else {
                             $this->config[$key] = $value;
                         }