Merge branch 'dev' of chenweida/jkzl-start into dev

common-data-es-starter/src/main/java/com/yihu/base/es/config/ElasticsearchUtil.java

@@ -28,7 +28,6 @@ import java.util.Map;
 * where quotaCode='1'
 * group by town,townName ， date_histogram(field='quotaDate','interval'='week')
 */
@Component
public class ElasticsearchUtil {
    private Logger logger = LoggerFactory.getLogger(ElasticsearchUtil.class);