fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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