From 8f305a775e0d6bf2ade573378866316bf025febe Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 28 Apr 2016 23:15:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Merge=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=B1=BB?=
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 9ef94a70..0a1b98ac 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -67,7 +67,7 @@ class Merge extends Model
         foreach (static::$relationModel as $key => $model) {
             $name  = is_int($key) ? $model : $key;
             $table = is_int($key) ? self::db()->name($name)->getTable() : $model;
-            $query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->pk);
+            $query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->getPk());
             $fields = self::getModelField($name, $table, $class->mapFields);
             $query->field($fields);
         }