Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-03-26 6941f2c4f33359d8746bc1388fb67e1995f96129

 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);
    }
}