1、bug的修复

2、内核更新
2016-07-10 23:48:24 +08:00
parent f3fff63632
commit 1a0a29413a
50 changed files with 760 additions and 958 deletions
@@ -51,7 +51,7 @@ class Collection extends \think\Collection
        return $this->paginator;
    }

-    public function toArray()
+    public function toArray($allow = [])
    {
        if ($this->paginator) {
            try {
@@ -64,10 +64,10 @@ class Collection extends \think\Collection
                'total'        => $total,
                'per_page'     => $this->listRows(),
                'current_page' => $this->currentPage(),
-                'data'         => parent::toArray()
+                'data'         => parent::toArray($allow)
            ];
        } else {
-            return parent::toArray();
+            return parent::toArray($allow);
        }
    }