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

变更数据



查看合并请求 !3138

@@ -63,6 +63,7 @@ class OnlineController extends BaseController
             'gl_project.title AS title',
             'gl_project.title AS title',
             'gl_project.channel AS channel',
             'gl_project.channel AS channel',
             'gl_project.type AS type',
             'gl_project.type AS type',
+            'gl_project.post_id AS post_id',
             'gl_project.created_at AS created_at',
             'gl_project.created_at AS created_at',
             'gl_project.is_upgrade AS is_upgrade',
             'gl_project.is_upgrade AS is_upgrade',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.id AS online_check_id',

@@ -197,6 +197,7 @@ class OptimizeController extends BaseController
             'gl_project.level AS level',
             'gl_project.level AS level',
             'gl_project.channel AS channel',
             'gl_project.channel AS channel',
             'gl_project.company AS company',
             'gl_project.company AS company',
+            'gl_project.post_id AS post_id',
             'gl_project.type AS type',
             'gl_project.type AS type',
             'gl_project.created_at AS created_at',
             'gl_project.created_at AS created_at',
             'gl_project.is_language AS is_language',
             'gl_project.is_language AS is_language',

@@ -96,6 +96,7 @@ class ProjectController extends BaseController
             'gl_project.title AS title',
             'gl_project.title AS title',
             'gl_project.channel AS channel',
             'gl_project.channel AS channel',
             'gl_project.company AS company',
             'gl_project.company AS company',
+            'gl_project.post_id AS post_id',
             'gl_project.type AS type',
             'gl_project.type AS type',
             'gl_project.project_type AS project_type',
             'gl_project.project_type AS project_type',
             'gl_project.extend_type AS extend_type',
             'gl_project.extend_type AS extend_type',

@@ -32,7 +32,7 @@ class RenewProjectController extends BaseController
      */
      */
     public function lists(Project $project){
     public function lists(Project $project){
         $map = $this->searchParam($this->map);
         $map = $this->searchParam($this->map);
-        $filed = ['id', 'title', 'type' ,'mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at','delete_status'];
+        $filed = ['id', 'title', 'type' , 'post_id','mysql_id' ,'channel','cooperate_date' ,'type', 'remain_day' ,'created_at','delete_status'];
         $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build')
         $lists = $project->formatQuery($map)->select($filed)->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('deploy_optimize')->with('online_check')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){