From 829d77f7145514d67d957ad54dbef854440f77d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 31 Jul 2020 17:05:08 +0800
Subject: [PATCH] fix conflect
---
src/main/java/com/xcong/excoin/modules/contract/service/ContractOrderService.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/ContractOrderService.java b/src/main/java/com/xcong/excoin/modules/contract/service/ContractOrderService.java
index 6b4f4b0..86cbb33 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/ContractOrderService.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/ContractOrderService.java
@@ -10,5 +10,4 @@
*/
public interface ContractOrderService extends IService<ContractOrderEntity> {
- public Result submitOrder(SubmitOrderDto submitOrderDto);
}
--
Gitblit v1.9.1