Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-11-15 47b56397ce10d4927ccc303539c103cf5d5dbe30

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