fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java

@@ -4,10 +4,15 @@
import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
import io.lettuce.core.dynamic.annotation.Param;

import io.lettuce.core.dynamic.annotation.Param;

/**
 * @author helius
 */
public interface FollowFollowerOrderRelationDao extends BaseMapper<FollowFollowerOrderRelationEntity> {

    Integer selectFollowerHoldingSymbolCnt(@Param("tradeMemberId") Long tradeMemberId, @Param("memberId") Long memberId);
   FollowFollowerOrderRelationEntity selectHistoryOneByorderId(@Param("orderId")Long orderId);
	
   FollowFollowerOrderRelationEntity selectNowOneByorderId(@Param("orderId")Long orderId);
}