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

xiaoyong931011

2021-05-25 3db83ef4add286feabba2d5db4eabfa27d5fc5f1

 src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java

@@ -161,6 +161,11 @@
    /**
     * 已实现盈亏
     */
    @TableField(exist = false)
//    @TableField(exist = false)
    private BigDecimal rewardAmount;

    /**
     * 维持保证金
     */
    private BigDecimal holdBond;
}