conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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

@@ -36,6 +36,6 @@
    private int type;

    public String getBondAmount() {
        return bondAmount.setScale(8, BigDecimal.ROUND_DOWN).toPlainString();
        return bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }
}