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

3 years ago · d18c6cfee1
3 changed files with 1 additions and 1 deletions
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java
@ -88,7 +88,7 @@ public class AsyncConfig {
    @Bean
    public ExecutorService executorService() {
        ThreadPoolTaskExecutor executor = (ThreadPoolTaskExecutor) executor();
-        return TtlExecutors.getTtlExecutorService(executor.getThreadPoolExecutor());
+        return executor.getThreadPoolExecutor();
    }

    /**
--- a/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/attention_nat_template.xlsx
--- a/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx