Merge branches 'cpv-back' and 'roc-bak' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-11-16 bb34b1893909ac35b9c36c2a87f7127901965d58

 src/main/java/com/xcong/excoin/FebsShiroApplication.java

@@ -22,5 +22,4 @@
                .web(WebApplicationType.SERVLET)
                .run(args);
    }

}