Merge branch 'fix_cygx3.1' of hongze/hongze_cygx into master

services/elastic.go

@@ -830,7 +830,7 @@ func EsMultiMatchFunctionScoreQueryTimeSort(indexName, keyWord string, startSize
 		}
 		n++
 	}
-	//boolquery.Should(matchArr...)
+	boolquery.Should(matchArr...)
 
 	//multiMatch2 := elastic.NewMultiMatchQuery(1, "IsSummary")
 	//bodyFunctionQuery2 := elastic.NewFunctionScoreQuery()