From 36a0f4456d9f1fd1fbc4c0d8fb1672743c4ca646 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 7 Jun 2016 21:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Merge=E7=B1=BB=E7=9A=84delete?=
 =?UTF-8?q?=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 c4903c59..5672ebc0 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -254,7 +254,7 @@ class Merge extends Model
             return false;
         }
 
-        $db = $this->query;
+        $db = $this->db();
         $db->startTrans('merge_delete_' . $this->name);
         try {
             $result = $db->delete($this->data);