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

xiaoyong931011

2021-05-27 61d5fd4ace2f9b6455dcf13df54a7ba7fa2baf36

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