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

xiaoyong931011

2021-04-16 17b569ed8554e755c9e5feedf6e7882cdf2c8d01

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