Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

Helius

2020-09-29 5cf08fb67c6491eac16ce986306108c4fce77ed9

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

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