Merge branch 'master' into whole_new

Helius

2020-09-13 099e6d54520dad06b887340ba02d532235360e5d

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

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



}