fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

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

@@ -22,5 +22,6 @@

    public abstract HoldOrderListVo holdOrderToDto(ContractHoldOrderEntity holdOrderEntity);

    @Mapping(target = "openingTime", source = "createTime")
    public abstract HoldOrderDetailVo holdOrderToOrderDetailVo(ContractHoldOrderEntity holdOrderEntity);
}