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

变更数据



查看合并请求 !3285

@@ -30,7 +30,8 @@ class ComController extends BaseController
             'project_id.required' => 'project_id不能为空',
         ]);
         $geoLinkModel = new GeoLink();
-        $lists = $geoLinkModel->lists($this->map,$this->page,$this->row);
+        $filed = ['id','project_id','url','da','type','created_at','updated_at'];
+        $lists = $geoLinkModel->lists($this->map,$this->page,$this->row,$filed);
         $this->response('success',Code::SUCCESS,$lists);
     }
 }

@@ -113,8 +113,8 @@ class RankDataLogic extends BaseLogic
             'remain_day' => $project['remain_day'],
             'seo_remain_day' => $project['seo_remain_day'],
             'g_top_plan' => $g_top_plan ?? [],
-            'is_remain_today'=>$project_id['is_remain_today'] ?? 0,
-            'bm_is_remain_today'=>$project_id['bm_is_remain_today'] ?? 0
+            'is_remain_today'=>$project['is_remain_today'] ?? 0,
+            'bm_is_remain_today'=>$project['bm_is_remain_today'] ?? 0
         ];
         //小语种列表
         $quanqiusou_api = new QuanqiusouApi();