diff --git a/library/think/Model.php b/library/think/Model.php index f5c8b9c8..f4457361 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -283,7 +283,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess // 检测修改器 $method = 'set' . Loader::parseName($name, 1) . 'Attr'; if (method_exists($this, $method)) { - $value = $this->$method($value, array_merge($data, $this->data)); + $value = $this->$method($value, $data); } elseif (isset($this->type[$name])) { // 类型转换 $value = $this->writeTransform($value, $this->type[$name]); diff --git a/library/think/model/relation/BelongsTo.php b/library/think/model/relation/BelongsTo.php index 327939d8..cdfa5da6 100644 --- a/library/think/model/relation/BelongsTo.php +++ b/library/think/model/relation/BelongsTo.php @@ -24,6 +24,7 @@ class BelongsTo extends OneToOne * @param string $foreignKey 关联外键 * @param string $localKey 关联主键 * @param string $joinType JOIN类型 + * @param string $relation 关联名 */ public function __construct(Model $parent, $model, $foreignKey, $localKey, $joinType = 'INNER', $relation = null) {