Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-03 f277f8fbba56fe460a1c954926f4699592ecfbca

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

@@ -4,6 +4,7 @@
import com.xcong.excoin.modules.contract.parameter.dto.ChangeBondDto;
import com.xcong.excoin.modules.contract.parameter.dto.ProfitOrLessDto;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitOrderDto;
import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo;
import com.xcong.excoin.modules.contract.parameter.vo.HoldOrderListVo;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.contract.service.ContractOrderService;
@@ -83,9 +84,12 @@
    }

    @ApiOperation(value = "获取合约页面资产信息")
    @ApiResponses({
            @ApiResponse(code = 0, message = "success", response = ContractMoneyInfoVo.class)
    })
    @GetMapping(value = "/findContractMoneyInfo")
    public Result findContractMoneyInfo(@ApiParam(name = "symbol", value = "币种", required = true, example = "BTC/USDT") @RequestParam(value = "symbol") String symbol) {
        return null;
        return contractHoldOrderService.findContractMoneyInfo(symbol);
    }

}