Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/cslg/pas/service/business/es/EsService.java

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

@@ -9,14 +9,11 @@ import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.controller.EventController;
 import cn.cslg.pas.controller.PatentController;
 import cn.cslg.pas.domain.es.FamilyPatent;
-import cn.cslg.pas.domain.es.Patent;
 import cn.cslg.pas.domain.es.PatentFamilyMessage;
 import cn.cslg.pas.service.business.ProductMarketDataService;
 import cn.cslg.pas.service.business.es.EsService;
-import co.elastic.clients.elasticsearch.core.DeleteRequest;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.entity.ContentType;
-import org.junit.Before;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;