Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

 src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java

@@ -65,7 +65,6 @@
    @ApiOperation(value = "全仓模式 -- 提交平仓委托单", notes = "平仓委托单")
    @PostMapping(value = "/submitCloseEntrustOrder")
    public Result submitCloseEntrustOrder(@RequestBody SubmitCloseEntrustDto submitCloseEntrustDto) {
        log.info("----->{}", submitCloseEntrustDto);
        return contractEntrustOrderService.addCloseContractEntrustOrder(submitCloseEntrustDto);
    }
}