From c45229c76267c059c1fa61c78709daca0b054b15 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 23 Jan 2017 11:06:07 +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 b876c2f3..35bf54c0 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -158,7 +158,7 @@ class Merge extends Model
             }
             // 数据对象赋值
             foreach ($data as $key => $value) {
-                $this->setAttr($key, $value);
+                $this->setAttr($key, $value, $data);
             }
             if (!empty($where)) {
                 $this->isUpdate = true;