fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 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);
}