Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

xiaoyong931011

2021-05-25 3341b7a0e2a8c719cf6eaf1591a721ec6b8e1fe4

 src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java

@@ -19,9 +19,10 @@

    IPage<EntrustListVo> findEntrustListInPage(EntrustOrderListDto dto);

    List<EntrustListInfoVo> findOwnEntrustOrder();
    List<EntrustListInfoVo> findOwnEntrustOrder(EntrustOrderListDto orderListDto);

    void cancelEntrustOrder(Long id);

    Result findEntrustOrderDetail(Long id);

}