conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

 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);



}