Merge remote-tracking branch 'origin/master' into test

src/main/java/com/example/xiaoshiweixinback/service/PatentService.java

@@ -12,14 +12,6 @@ import org.springframework.stereotype.Service;
 public class PatentService {
     @Autowired
     private EsService esService;
-    public Object queryMessage(QueryRequest queryRequest) throws Exception {
-        PatentDTO patentDTO = esService.esSearch(queryRequest);
-        Records records = new Records();
-        records.setCurrent(queryRequest.getCurrent());
-        records.setSize(queryRequest.getSize());
-//        records.setData(patentDTO.getPatents());
-        records.setTotal(patentDTO.getTotal());
-        return records;
-    }
+
 
 }