Merge remote-tracking branch 'origin/div' into div

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java

@@ -13,6 +13,13 @@

   TeamEincomeRecord selectByUidAndPreRecieveTimeAndType(@Param("uid") Long uid,
         @Param("preRecieveTime") Date preRecieveTime, @Param("type") int type);
	
	
   TeamEincomeRecord selectByUidAndPreRecieveTimeAndTypeAndSourceType(@Param("uid") Long uid,
         @Param("preRecieveTime") Date preRecieveTime, @Param("type") int type, @Param("sourceType") Integer sourceType);
	
	
	

   TeamEincomeRecord selectByPrimaryKeyForUpdate(Long id);