Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-05-12 2720d8d8e2ea1a03e6dd42809d75f788349f66c8

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java

@@ -70,6 +70,6 @@
    }

    public BigDecimal getProfitOrLess() {
        return profitOrLess == null ? profitOrLess.setScale(2, BigDecimal.ROUND_DOWN);
        return profitOrLess == null ? profitOrLess : profitOrLess.setScale(2, BigDecimal.ROUND_DOWN);
    }
}