fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

@@ -1,6 +1,9 @@
package com.xcong.excoin.modules.contract.service;


import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;

import java.util.List;

/**
@@ -9,4 +12,8 @@
public interface RabbitOrderService {

    public void cancelHoldOrder(List<Long> ids);

    public void entrustCloseOrder(List<OrderModel> list);

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