fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/documentary/service/FollowOrderOperationService.java

@@ -9,5 +9,18 @@
public interface FollowOrderOperationService {


    /**
     * 添加跟随者订单
     *
     * @param id 交易员持仓订单ID
     */
    public void addFollowerOrder(Long id);

    /**
     * 跟随者订单平仓
     *
     * @param oldOrderId 交易员持仓ID
     * @param newOrderId 交易员平仓后历史ID
     */
    public void closingFollowOrders(String orderNo);
}