fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

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

@@ -17,4 +17,6 @@
   IPage<HistoryOrderRecordsVo> selectHistoryOrderRecords(Page<HistoryOrderRecordsVo> page, 

         @Param("memberId")Long memberId);



   FollowTraderProfitInfoVo selectOneByMemberId(@Param("memberId")long memberId);



}