From c606b75ab861974dc100a88809c0cad2cee5ef02 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 18 May 2016 15:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BMerge=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84attachQuery=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/Merge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index 4b1cd0c8..6f35b297 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -59,8 +59,8 @@ class Merge extends Model
      */
     protected static function attachQuery($query)
     {
-        $master = basename(str_replace('\\', '/', get_called_class()));
         $class  = new static();
+        $master = $class->name;
         $fields = self::getModelField($master, '', $class->mapFields);
         $query->alias($master)->field($fields);