更新内核

增加自定义表单（未完成）
2017-07-04 12:13:24 +08:00
parent 8af311aa07
commit aef819d417
82 changed files with 12328 additions and 59 deletions
--- a/core/library/think/model/relation/BelongsToMany.php
+++ b/core/library/think/model/relation/BelongsToMany.php
@@ -105,9 +105,8 @@ class BelongsToMany extends Relation
    {
        $foreignKey = $this->foreignKey;
        $localKey   = $this->localKey;
-        $middle     = $this->middle;
+        $pk         = $this->parent->getPk();
        // 关联查询
-        $pk                              = $this->parent->getPk();
        $condition['pivot.' . $localKey] = $this->parent->$pk;
        return $this->belongsToManyQuery($foreignKey, $localKey, $condition);
    }