From 1b65f2ec4134a1cd730d4cc12baeb92497b09c3a Mon Sep 17 00:00:00 2001 From: thinkphp Date: Sun, 10 Sep 2017 12:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=85=B3=E8=81=94Relation?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/model/Relation.php | 3 ++- library/think/model/relation/MorphTo.php | 7 ------- library/think/model/relation/OneToOne.php | 7 ------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/library/think/model/Relation.php b/library/think/model/Relation.php index 4869e526..19a06c10 100644 --- a/library/think/model/Relation.php +++ b/library/think/model/Relation.php @@ -108,7 +108,8 @@ abstract class Relation * @access protected * @return void */ - abstract protected function baseQuery(); + protected function baseQuery() + {} public function __call($method, $args) { diff --git a/library/think/model/relation/MorphTo.php b/library/think/model/relation/MorphTo.php index df104a90..9136d78e 100644 --- a/library/think/model/relation/MorphTo.php +++ b/library/think/model/relation/MorphTo.php @@ -271,11 +271,4 @@ class MorphTo extends Relation return $this->parent->setRelation($this->relation, null); } - /** - * 执行基础查询(进执行一次) - * @access protected - * @return void - */ - protected function baseQuery() - {} } diff --git a/library/think/model/relation/OneToOne.php b/library/think/model/relation/OneToOne.php index 7877eaaa..9cf307a5 100644 --- a/library/think/model/relation/OneToOne.php +++ b/library/think/model/relation/OneToOne.php @@ -311,11 +311,4 @@ abstract class OneToOne extends Relation return $data; } - /** - * 执行基础查询(进执行一次) - * @access protected - * @return void - */ - protected function baseQuery() - {} }