From d213339dbd233551c9315f34edb907fb3661076a Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 19 Jun 2016 15:42:05 +0800
Subject: [PATCH] =?UTF-8?q?Model=E7=B1=BB=E7=B1=BB=E5=9E=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2timestamp=E5=92=8Cdatetime=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Model.php b/library/think/Model.php
index 2a0c6010..953ac326 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -301,12 +301,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             case 'boolean':
                 $value = (bool) $value;
                 break;
-            case 'datetime':
+            case 'timestamp':
                 if (!is_numeric($value)) {
                     $value = strtotime($value);
                 }
                 break;
-            case 'timestamp':
+            case 'datetime':
                 $format = !empty($param) ? $param : $this->dateFormat;
                 $value  = date($format, is_numeric($value) ? $value : strtotime($value));
                 break;
@@ -382,11 +382,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             case 'boolean':
                 $value = (bool) $value;
                 break;
-            case 'datetime':
+            case 'timestamp':
                 $format = !empty($param) ? $param : $this->dateFormat;
                 $value  = date($format, $value);
                 break;
-            case 'timestamp':
+            case 'datetime':
                 $format = !empty($param) ? $param : $this->dateFormat;
                 $value  = date($format, strtotime($value));
                 break;