From 62de83358a86190ba8aa935afd176797b5c4f2e6 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 22 Jun 2016 22:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Merge=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/Merge.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index 8ade20ce..2239af73 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -250,7 +250,7 @@ class Merge extends Model
             return $result;
         } catch (\Exception $e) {
             $db->rollback();
-            return false;
+            throw $e;
         }
     }
 
@@ -283,9 +283,9 @@ class Merge extends Model
             $this->trigger('after_delete', $this);
             $db->commit();
             return $result;
-        } catch (\PDOException $e) {
+        } catch (\Exception $e) {
             $db->rollback();
-            return false;
+            throw $e;
         }
     }