Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-05 411814a852dd16cd634b79eceeff5d5aa9483d96

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

@@ -5,7 +5,6 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * 合约持仓订单表
@@ -95,8 +94,6 @@
     * 开仓类型 1-开多 2-开空
     */
    private int openingType;

    private Date openingTime;

    /**
     * 开仓手续费