Merge branch 'dev' of https://github.com/top-think/framework into dev

2026-07-02 21:52:34 +08:00 · 2016-04-08 15:43:32 +08:00
parent 70de311a1d 46578f232a
commit 13142d6a6b
1 changed files with 1 additions and 1 deletions
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -74,7 +74,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
    /**
     * 架构函数
     * @access public
-     * @param array $data 数据
+     * @param array|object $data 数据
     */
    public function __construct($data = [])
    {