From 681d5d223b172b6d4ad5b20a4ae33a596e6c37ed Mon Sep 17 00:00:00 2001
From: yunwuxin <448901948@qq.com>
Date: Thu, 19 May 2016 18:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Model.php b/library/think/Model.php
index c13c6785..149c9e09 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -616,10 +616,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     /**
      * 查找单条记录
      * @access public
-     * @param mixed $data 主键值或者查询条件（闭包）
-     * @param string $with 关联预查询
-     * @param bool $cache 是否缓存
-     * @return \think\Model
+     * @param mixed        $data  主键值或者查询条件（闭包）
+     * @param array|string $with  关联预查询
+     * @param bool         $cache 是否缓存
+     * @return static
+     * @throws exception\DbException
      */
     public static function get($data = '', $with = [], $cache = false)
     {
@@ -630,10 +631,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     /**
      * 查找所有记录
      * @access public
-     * @param mixed $data 主键列表或者查询条件（闭包）
-     * @param string $with 关联预查询
-     * @param bool $cache 是否缓存
-     * @return array|false|string
+     * @param mixed        $data  主键列表或者查询条件（闭包）
+     * @param array|string $with  关联预查询
+     * @param bool         $cache 是否缓存
+     * @return static[]|false
+     * @throws exception\DbException
      */
     public static function all($data = [], $with = [], $cache = false)
     {