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

Helius

2020-07-07 960a8a614ab08485ffa334a916d1b24d5f9e198c

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