mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 07:12:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2016-05-19 18:42:45 +08:00
parent 40d4bfe4da 681d5d223b
commit b235c16589
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/think/Model.php
View File

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