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

变更数据



查看合并请求 !2859

@@ -49,7 +49,7 @@ class GeoQuestionResLogic extends BaseLogic
     public function getResultList($map = [],$page = 1,$row = 20,$order = 'created_at',$sort = 'desc'){
     public function getResultList($map = [],$page = 1,$row = 20,$order = 'created_at',$sort = 'desc'){
         unset($map['sort']);
         unset($map['sort']);
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $map['is_match'] = ['!=',0];
+        $map['hit'] = ['!=',0];
         $filed = ['id','project_id','question_id','platform','is_match','question','en_question','keywords','url','label','cosine','created_at','updated_at'];
         $filed = ['id','project_id','question_id','platform','is_match','question','en_question','keywords','url','label','cosine','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']];