fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

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

@@ -9,4 +9,6 @@


   FollowTraderInfoEntity selectFollowTraderInfoEntityBytreaderId(@Param("traderId")Long traderId);



   FollowTraderInfoEntity selectTraderInfoByMemberId(@Param("memberId") Long memberId);



}