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

2026-07-01 20:52:48 +08:00 · 2016-05-06 17:28:57 +08:00
parent e2828d3ff6 2a42932f12
commit 5afe5bdc13
1 changed files with 4 additions and 0 deletions
--- a/library/think/model/Relation.php
+++ b/library/think/model/Relation.php
@@ -14,6 +14,7 @@ namespace think\model;
 use think\Db;
 use think\Exception;
 use think\Loader;
+use think\Model;
 use think\model\Pivot;

 class Relation
@@ -453,6 +454,9 @@ class Relation
     */
    public function save($data, array $pivot = [])
    {
+        if ($data instanceof Model) {
+            $data = $data->toArray();
+        }
        // 判断关联类型
        switch ($this->type) {
            case self::HAS_ONE: