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

Helius

2020-06-03 59467b7af29e66e8a4cd009e414b7123765bb73c

 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);