From fafcbb049e211dec5ca9dc1c502111be08762d62 Mon Sep 17 00:00:00 2001
From: shenfakuan <shenfakuan@163.com>
Date: Tue, 10 May 2016 17:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=90=8E?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5save=20update=5Ftime=20=E7=AD=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=E4=B8=8D=E6=9B=B4=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index d02cbac8..778fc531 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -400,7 +400,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                 $value = null;
             }
             if (!in_array($field, $this->change)) {
-                $this->__set($field, isset($this->data[$field]) ? $this->data[$field] : $value);
+                if(in_array($field, $this->autoTimeField)) {
+                    $this->__set($field, $value);
+                } else {
+                    $this->__set($field, isset($this->data[$field]) ? $this->data[$field] : $value);
+                }
             }
         }
     }