Merge branch 'master' into whole_new

Helius

2020-09-11 afc924b0d88ef320ad09060ae49804556efd8eb6

 src/test/java/com/xcong/excoin/WholeTest.java

@@ -156,4 +156,6 @@
        CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
    }



}