mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 15:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正Merge模型类

Browse Source
This commit is contained in:
thinkphp
2016-05-02 16:17:52 +08:00
parent e41120dcbf
commit 483a86e1a7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/model/Merge.php
View File

@@ -143,9 +143,10 @@ class Merge extends Model
* @access public * @access public
* @param mixed $data 数据 * @param mixed $data 数据
* @param array $where 更新条件 * @param array $where 更新条件
* @param bool $getId 新增的时候是否获取id
* @return mixed * @return mixed
*/ */
public function save($data = [], $where = []) public function save($data = [], $where = [], $getId = true)
{ {
if (!empty($data)) { if (!empty($data)) {
// 数据对象赋值 // 数据对象赋值