Merge branch 'feature/add_item' into hotfix/company_bug

Application/Admin/Controller/PartnerController.class.php

@@ -280,6 +280,8 @@ class PartnerController extends ThinkController
 //        $count = $model
 //            ->where($map)
 //            ->count();
+        $arraypage = $page;
+
         //分页
         $parameter['p'] = $page;
         $parameter['row'] = $row;
@@ -288,7 +290,7 @@ class PartnerController extends ThinkController
             $this->assign('_page', $page);
         }
 
-        $arraypage = $page;
+//        $arraypage = $page;
         $size = $row;//每页显示的记录数
         $parseData = array_slice($parseData, ($arraypage - 1) * $size, $size);
 //        $page = set_pagination($count, $row, $parameter);