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

xiaoyong931011

2021-11-25 5ffa4ccd62c2f32b5808e0a5f6c9a65142c201ff

 src/main/java/com/xcong/excoin/modules/contract/service/ContractEntrustOrderService.java

@@ -14,7 +14,7 @@

    public Result addContractEntrustOrder(SubmitEntrustDto submitEntrustDto);

    public Result findEntrustOrderList();
    public Result findEntrustOrderList(String symbol);

    public Result cancelEntrustOrder(Long id);