Merge branch 'master' into follow

Helius

2020-08-11 f91a65805c27c2bb01eb94f1ec9c2afa07a44020

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

@@ -24,6 +24,7 @@
    @Mapping(source = "entrustPrice", target = "entrustOpeningPrice")
    @Mapping(source = "createTime", target = "entrustTime")
    @Mapping(source = "entrustAmount", target = "prePaymentAmount")
    @Mapping(source = "entrustType", target = "orderType")
    public abstract ContractOrderEntity entrustOrderToOrder(ContractEntrustOrderEntity orderEntity);

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

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

    @Mapping(source = "entrustAmount", target = "prePaymentAmount")
    public abstract ContractHoldOrderEntity entrustOrderToHoldOrder(ContractEntrustOrderEntity entrustOrderEntity);

}