内核更新

2017-02-14 09:41:34 +08:00
parent 689376a5d9
commit b355535009
43 changed files with 330 additions and 100 deletions
--- a/core/library/think/model/Merge.php
+++ b/core/library/think/model/Merge.php
@@ -22,7 +22,7 @@ class Merge extends Model
    protected $mapFields     = []; //  需要处理的模型映射字段，避免混淆 array( id => 'user.id'  )

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param array|object $data 数据
     */