From c9a0d4dbaabf4fe671d6b1bc2e65a5b104501daf Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 2 May 2016 22:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BModel=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Controller.php b/library/think/Controller.php
index d85d62c9..c58360ea 100644
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -137,7 +137,7 @@ class Controller
      * @param string|array $validate 验证器名或者验证规则数组
      * @param array $message 提示信息
      * @param mixed $callback 回调方法（闭包）
-     * @return void
+     * @return true|string|array
      */
     public function validate($data, $validate, $message = [], $callback = null)
     {
diff --git a/library/think/Model.php b/library/think/Model.php
index d9ad7794..f4f77c13 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -874,7 +874,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                         $value = (bool) $value;
                         break;
                     case 'datetime':
-                        $value = strtotime($value);
+                        if (!is_numeric($value)) {
+                            $value = strtotime($value);
+                        }
                         break;
                     case 'object':
                         if (is_object($value)) {