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

gx数据



查看合并请求 !2595

@@ -165,6 +165,7 @@ class GeoQuestionRes extends Command
                         'keywords_num'=>$keyword_num ?? [],
                         'keywords_num'=>$keyword_num ?? [],
                         'url_num'=>$url_num ?? [],
                         'url_num'=>$url_num ?? [],
                         'is_match'=>$is_match ?? 0,
                         'is_match'=>$is_match ?? 0,
+                        'label'=>$taskInfo['label'] ?? null,
                         'created_at'=>date('Y-m-d H:i:s'),
                         'created_at'=>date('Y-m-d H:i:s'),
                         'updated_at'=>date('Y-m-d H:i:s'),
                         'updated_at'=>date('Y-m-d H:i:s'),
                     ];
                     ];

@@ -48,7 +48,7 @@ class GeoQuestionResLogic extends BaseLogic
      */
      */
     public function getResultList($map = [],$page = 1,$row = 20){
     public function getResultList($map = [],$page = 1,$row = 20){
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $filed = ['id','project_id','question_id','platform','is_match','question','en_question','keywords','url','created_at','updated_at'];
+        $filed = ['id','project_id','question_id','platform','is_match','question','en_question','keywords','url','label','created_at','updated_at'];
         if(!empty($map['created_at'])){
         if(!empty($map['created_at'])){
             $map['created_at'] = ['between',[$map['created_at'].' 00:00:00',$map['created_at'].' 23:59:59']];
             $map['created_at'] = ['between',[$map['created_at'].' 00:00:00',$map['created_at'].' 23:59:59']];
             $this->model = new GeoQuestionLog();
             $this->model = new GeoQuestionLog();