From 5c733a7743fa4746ab4b7f206446658f0aedd2bf Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 4 Jul 2017 23:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=99=A8=E5=92=8C=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=99=A8=E6=96=B9=E6=B3=95=E6=94=AF=E6=8C=81=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=8F=82=E6=95=B0=E5=85=B3=E8=81=94=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index 602f77ab..b90cd54e 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -353,7 +353,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             // 检测修改器
             $method = 'set' . Loader::parseName($name, 1) . 'Attr';
             if (method_exists($this, $method)) {
-                $value = $this->$method($value, array_merge($this->data, $data));
+                $value = $this->$method($value, array_merge($this->data, $data), $this->relation);
             } elseif (isset($this->type[$name])) {
                 // 类型转换
                 $value = $this->writeTransform($value, $this->type[$name]);
@@ -532,7 +532,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         // 检测属性获取器
         $method = 'get' . Loader::parseName($name, 1) . 'Attr';
         if (method_exists($this, $method)) {
-            $value = $this->$method($value, $this->data);
+            $value = $this->$method($value, $this->data, $this->relation);
         } elseif (isset($this->type[$name])) {
             // 类型转换
             $value = $this->readTransform($value, $this->type[$name]);