fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/contract/service/RabbitOrderService.java

@@ -15,6 +15,5 @@

    public void entrustCloseOrder(List<OrderModel> list);


    public void wholeBombOrder(MemberEntity memberEntity);
    public void wholeBombOrder(List<OrderModel> list);
}