Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/cho...

gao

2020-05-27 84d6908d149ba8b0f8a4ea335e71bcc0778d17f0

 src/main/java/com/xcong/excoin/configurations/WebMvcConfig.java

@@ -38,8 +38,8 @@
                .allowCredentials(true).maxAge(3600);
    }

    @Bean
    public SpringContextHolder springContextHolder() {
        return new SpringContextHolder();
    }
//    @Bean
//    public SpringContextHolder springContextHolder() {
//        return new SpringContextHolder();
//    }
}