diff --git a/library/think/Model.php b/library/think/Model.php
index be01b26b..00f5a3f4 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -322,7 +322,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         $this->autoCompleteData($this->auto);
 
         // 自动写入更新时间
-        if ($this->autoWriteTimestamp) {
+        if ($this->autoWriteTimestamp && $this->updateTime) {
             $this->__set($this->updateTime, null);
         }
 
@@ -368,7 +368,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             $this->autoCompleteData($this->insert);
 
             // 自动写入创建时间
-            if ($this->autoWriteTimestamp) {
+            if ($this->autoWriteTimestamp && $this->createTime) {
                 $this->__set($this->createTime, null);
             }
 
diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index 11548ae6..f34d8d3a 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -166,7 +166,7 @@ class Merge extends Model
         $this->autoCompleteData($this->auto);
 
         // 自动写入更新时间
-        if ($this->autoWriteTimestamp) {
+        if ($this->autoWriteTimestamp && $this->updateTime) {
             $this->__set($this->updateTime, null);
         }
 
@@ -202,7 +202,7 @@ class Merge extends Model
                 $this->autoCompleteData($this->insert);
 
                 // 自动写入创建时间
-                if ($this->autoWriteTimestamp) {
+                if ($this->autoWriteTimestamp && $this->createTime) {
                     $this->__set($this->createTime, null);
                 }