Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -310,7 +310,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         }
     }
 
-    @Async
+    @Async("executorService")
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId) {
         String userId = null;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -332,7 +332,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }).collect(Collectors.toList());
     }
 
-    @Async
+    @Async("executorService")
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId) {
         try {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java

@@ -160,7 +160,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
         }
     }
 
-    @Async
+    @Async("executorService")
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId) {
         String userId = null;