Merge branch 'master' into whole

Helius

2020-08-24 1afe0ef75b6741a322cd8057870585a3c03d4da3

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

@@ -34,4 +34,8 @@

    @ApiModelProperty(value = "委托类型 1-开多 2-开空")
    private int type;

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