Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-04-16 17b569ed8554e755c9e5feedf6e7882cdf2c8d01

 src/main/java/com/xcong/excoin/utils/SpringContextHolder.java

@@ -61,6 +61,7 @@
        if (SpringContextHolder.applicationContext != null) {
            log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
        }
        log.info("=====================");
        SpringContextHolder.applicationContext = applicationContext;
    }
}