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

wzy

2020-11-29 18ec469960104139455f8a3863e3c9e8fb1f32d2

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