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

src/test/java/cn/cslg/pas/service/EsScratchWordsServiceTest.java

@@ -48,7 +48,6 @@ private EsService esService;
     @Test
     public void getPatent() throws Exception {
 
-        esScratchWordsService.query11();
 
     }