Merge branch 'master' into whole_new

Helius

2020-09-13 b98dd4349c26a6d282e6e19b4d31e8e1ef5b5f5e

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

@@ -78,7 +78,7 @@
            @Override
            public void run() {
                try {
                    CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
                    CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
                } catch (Exception e) {
                    log.error("全仓模式预估强平价", e);
                }