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

xiaoyong931011

2020-05-31 ef1ee6b8fc046edc8f7cc8ead3f3f293da190b0d

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

@@ -31,6 +31,6 @@

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

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

}