内核更新

This commit is contained in:
2017-03-16 12:03:34 +08:00
parent b355535009
commit a4d58f9f09
28 changed files with 438 additions and 217 deletions

View File

@@ -16,13 +16,17 @@ use think\Model;
class Pivot extends Model
{
/** @var Model */
public $parent;
/**
* 构造函数
* @access public
* @param array|object $data 数据
* @param string $table 中间数据表名
* @param Model $parent
* @param array|object $data 数据
* @param string $table 中间数据表名
*/
public function __construct($data = [], $table = '')
public function __construct(Model $parent, $data = [], $table = '')
{
if (is_object($data)) {
$this->data = get_object_vars($data);
@@ -30,6 +34,8 @@ class Pivot extends Model
$this->data = $data;
}
$this->parent = $parent;
$this->table = $table;
}