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

xiaoyong931011

2020-06-05 411814a852dd16cd634b79eceeff5d5aa9483d96

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

@@ -32,6 +32,7 @@

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

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

}