作者 lyh

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -598,6 +598,7 @@ class ProjectController extends BaseController @@ -598,6 +598,7 @@ class ProjectController extends BaseController
598 $param = [ 598 $param = [
599 "id" => $item['id'], 599 "id" => $item['id'],
600 "title" => $item['title'], 600 "title" => $item['title'],
  601 + "company" => $item['company'],
601 "type" => $item['type'], 602 "type" => $item['type'],
602 "type_text" => Project::typeMap()[$item['type']] ?? '', 603 "type_text" => Project::typeMap()[$item['type']] ?? '',
603 "channel" => $item['channel'], 604 "channel" => $item['channel'],
@@ -627,7 +628,7 @@ class ProjectController extends BaseController @@ -627,7 +628,7 @@ class ProjectController extends BaseController
627 628
628 $list[] = $param; 629 $list[] = $param;
629 } 630 }
630 -  
631 - $this->response('success',Code::SUCCESS, $list); 631 + $data['list'] = $list;
  632 + $this->response('success',Code::SUCCESS, $data);
632 } 633 }
633 } 634 }