From 8831298e8fbf414efbe9e7563f50f59eaf94ef3f Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 14 Jul 2016 10:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BMerge=E7=B1=BBsave=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index 2239af73..1bf634f4 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -224,7 +224,7 @@ class Merge extends Model
                 }
 
                 // 处理模型数据
-                $data = $this->parseData($this->name, $this->data);
+                $data = $this->parseData($this->name, $this->data, true);
                 // 写入主表数据
                 $result = $db->name($this->name)->strict(false)->insert($data, $replace);
                 if ($result) {