Merge branch 'master' of https://github.com/top-think/think-orm

# Conflicts:
#	src/Model.php
#	src/db/Query.php

Author: liu21st

src/Model.php

@@ -526,8 +526,6 @@ protected function insertData($sequence)
 
         $result = $this->db(false)->strict(false)->field($allowFields)->insert($this->data);
 
-        $pk = $this->getPk();
-
         // 获取自动增长主键
         if ($result && $insertId = $this->db(false)->getLastInsID($sequence)) {
             $pk = $this->getPk();

src/db/Query.php

@@ -2408,8 +2408,7 @@ public function findOrFail($data = null)
     public function chunk($count, $callback, $column = null, $order = 'asc')
     {
         $options = $this->getOptions();
-
-        $column = $column ?: $this->getPk($options);
+        $column  = $column ?: $this->getPk($options);
 
         if (isset($options['order'])) {
             if ($this->config['debug']) {