From 829d77f7145514d67d957ad54dbef854440f77d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 31 Jul 2020 17:05:08 +0800
Subject: [PATCH] fix conflect

---
 src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java
index a6c1a0e..e7448a9 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerOrderRelationDao.java
+++ b/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);
 }

--
Gitblit v1.9.1