From 483a86e1a7856f0147f073b44a57651cc15985b4 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 2 May 2016 16:17:52 +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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index 0a1b98ac..5384bb64 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -143,9 +143,10 @@ class Merge extends Model
      * @access public
      * @param mixed $data 数据
      * @param array $where 更新条件
+     * @param bool $getId 新增的时候是否获取id
      * @return mixed
      */
-    public function save($data = [], $where = [])
+    public function save($data = [], $where = [], $getId = true)
     {
         if (!empty($data)) {
             // 数据对象赋值