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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

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

@@ -16,5 +16,13 @@
   TeamEincomeRecord selectByPrimaryKeyForUpdate(Long id);

   List<TeamEincomeRecord> listByUidAndPreRecieveTimeAndState(@Param("uid") Long uid,
         @Param("preRecieveTime") Date preRecieveTime, @Param("state") int state);
         @Param("preRecieveTime") Date preRecieveTime, @Param("typeList") List<Integer> typeList,
         @Param("state") int state);

   public List<Long> listCanRecieveUid(@Param("preRecieveTime") Date preRecieveTime,
         @Param("typeList") List<Integer> typeList,@Param("start") long start,@Param("count")int count);

   public long countCanRecieveUid(@Param("preRecieveTime") Date preRecieveTime,
         @Param("typeList") List<Integer> typeList);

}