Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/pancm/easticsearch/EsHighLevelRestSearchTest.java
#	src/main/java/com/pancm/easticsearch/EsHighLevelRestTest1.java
#	src/main/java/com/pancm/easticsearch/JestTest.java
This commit is contained in:
xuwujing 2019-04-01 17:56:41 +08:00
commit 64baf9e6b6
3 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
package com.pancm.easticsearch;
package com.pancm.sql.easticsearch;
import java.io.IOException;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.pancm.easticsearch;
package com.pancm.sql.easticsearch;
import java.io.IOException;
import java.util.HashMap;

View File

@ -1,4 +1,4 @@
package com.pancm.easticsearch;
package com.pancm.sql.easticsearch;
import java.io.Serializable;
import java.util.ArrayList;