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

Helius

2020-06-01 cbd08213b41c55cf630f6ab15befbc637b5b7ba6

 src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java

@@ -23,6 +23,7 @@

    @Mapping(source = "entrustPrice", target = "entrustOpeningPrice")
    @Mapping(source = "createTime", target = "entrustTime")
    @Mapping(source = "entrustAmount", target = "prePaymentAmount")
    public abstract ContractOrderEntity entrustOrderToOrder(ContractEntrustOrderEntity orderEntity);

    @Mapping(source = "createTime", target = "entrustTime")
@@ -31,6 +32,6 @@

    public abstract List<ContractEntrustVo> entityListToVoList(List<ContractEntrustOrderEntity> list);

    public abstract ContractHoldOrderEntity entrustOrderToHoldOrder(ContractHoldOrderEntity contractHoldOrderEntity);
    public abstract ContractHoldOrderEntity entrustOrderToHoldOrder(ContractEntrustOrderEntity entrustOrderEntity);

}