Merge branch 'master' into follow

Helius

2020-07-30 d06ad40bfc01f17441527a710dd91e30ebe6ddb0

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

@@ -12,7 +12,7 @@
public interface FollowTraderProfitInfoDao extends BaseMapper<FollowTraderProfitInfoEntity> {

   

   IPage<FollowTraderProfitInfoVo> selectFollowTraderProfitInfoEntity(Page<FollowTraderProfitInfoVo> page,

         @Param("record")FollowTraderProfitInfoEntity memberAccountMoneyChange);

         @Param("record")FollowTraderProfitInfoEntity followTraderProfitInfoEntity);



   IPage<HistoryOrderRecordsVo> selectHistoryOrderRecords(Page<HistoryOrderRecordsVo> page, 

         @Param("memberId")Long memberId);