合并分支 'lyh-server' 到 'master'

gx所有下载人事信息



查看合并请求 !2110

@@ -39,7 +39,7 @@ class HrController extends BaseController
      */
      */
     public function getManagerList(){
     public function getManagerList(){
         $manageHrModel = new ManageHr();
         $manageHrModel = new ManageHr();
-        $lists = $manageHrModel->list($this->map,'id',['*']);
+        $lists = $manageHrModel->lists($this->map,$this->page,$this->row);
         $this->response('success', Code::SUCCESS, $lists);
         $this->response('success', Code::SUCCESS, $lists);
     }
     }