merge master

Helius

2020-08-13 a7b8fd2b18e652730cd4e48da61adee89564b4b6

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