From 680be85343d09febcd9f2038da3c751379bd7734 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 14 Feb 2018 22:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9Bfield=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 0396faca..53aa71b5 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -793,7 +793,7 @@ class Query
         }
 
         if (isset($this->options['field'])) {
-            $field = array_merge($this->options['field'], $field);
+            $field = array_merge((array) $this->options['field'], $field);
         }
         $this->options['field'] = array_unique($field);
         return $this;