From 459a2290ac65c1b0c48210ec3f9c4ed91a4ca974 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 27 Jul 2017 08:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=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 | 6 +++--- library/think/model/relation/HasMany.php | 2 +- library/think/model/relation/HasOne.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/think/Model.php b/library/think/Model.php index 019cb8dc..7777e231 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -1855,7 +1855,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @access public * @param string $model 模型名 * @param string $foreignKey 关联外键 - * @param string $localKey 关联主键 + * @param string $localKey 当前模型主键 * @param array $alias 别名定义（已经废弃） * @param string $joinType JOIN类型 * @return HasOne @@ -1895,7 +1895,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @access public * @param string $model 模型名 * @param string $foreignKey 关联外键 - * @param string $localKey 关联主键 + * @param string $localKey 当前模型主键 * @return HasMany */ public function hasMany($model, $foreignKey = '', $localKey = '') @@ -1914,7 +1914,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess * @param string $through 中间模型名 * @param string $foreignKey 关联外键 * @param string $throughKey 关联外键 - * @param string $localKey 关联主键 + * @param string $localKey 当前模型主键 * @return HasManyThrough */ public function hasManyThrough($model, $through, $foreignKey = '', $throughKey = '', $localKey = '') diff --git a/library/think/model/relation/HasMany.php b/library/think/model/relation/HasMany.php index 9624fc67..ba307ec7 100644 --- a/library/think/model/relation/HasMany.php +++ b/library/think/model/relation/HasMany.php @@ -24,7 +24,7 @@ class HasMany extends Relation * @param Model $parent 上级模型对象 * @param string $model 模型名 * @param string $foreignKey 关联外键 - * @param string $localKey 关联主键 + * @param string $localKey 当前模型主键 */ public function __construct(Model $parent, $model, $foreignKey, $localKey) { diff --git a/library/think/model/relation/HasOne.php b/library/think/model/relation/HasOne.php index 99327da2..bb95ef19 100644 --- a/library/think/model/relation/HasOne.php +++ b/library/think/model/relation/HasOne.php @@ -23,7 +23,7 @@ class HasOne extends OneToOne * @param Model $parent 上级模型对象 * @param string $model 模型名 * @param string $foreignKey 关联外键 - * @param string $localKey 关联主键 + * @param string $localKey 当前模型主键 * @param string $joinType JOIN类型 */ public function __construct(Model $parent, $model, $foreignKey, $localKey, $joinType = 'INNER')