Merge branch 'master' into whole_new

Helius

2020-09-13 b98dd4349c26a6d282e6e19b4d31e8e1ef5b5f5e

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

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