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

zainali5120

2020-10-12 43385a77303aa2295d902b5a2be9e28723d08cef

 src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java

@@ -9,11 +9,7 @@
import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;

import com.xcong.excoin.modules.symbols.constants.SymbolsConstats;

import org.springframework.validation.annotation.Validated;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.bind.annotation.*;



import com.xcong.excoin.common.response.Result;

import com.xcong.excoin.modules.coin.parameter.dto.CancelEntrustWalletCoinOrderDto;

@@ -39,6 +35,7 @@
@Api(value = "币币交易接口", tags = "币币交易接口")

@RestController

@RequestMapping(value = "/api/orderCoin")

@CrossOrigin("*")

public class OrderCoinController {

   

   @Resource