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

Lyh server



查看合并请求 !1732

@@ -67,6 +67,7 @@ class OnlineController extends BaseController
             'gl_project.is_upgrade AS is_upgrade',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
+            'gl_project_online_check.go_question AS go_question',
             'gl_project_online_check.optimist_status AS optimist_status',
             'gl_project_online_check.qa_status AS qa_status',
             'gl_project_payment.amount AS amount',

@@ -29,9 +29,9 @@ class GoogleLinkController extends BaseController
         if(empty($lists['list'])){
             $linkService = new GoogleLinkService();
             $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']);
-            $data = $this->paginateArray($data,$this->page,$this->row);
+            $lists = $this->paginateArray($data,$this->page,$this->row);
         }
-        $this->response('success',Code::SUCCESS,$data);
+        $this->response('success',Code::SUCCESS,$lists);
     }
 
     /**