Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-04-06 bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94

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

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