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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackWinInviteMapper.java

@@ -88,4 +88,16 @@
    * @return
    */
   long countTeamNumByTid(@Param("uid")Long uid, @Param("teamUid")Long teamUid);
	
	
   /**
    *  获取奖励记录
    * @param uid
    * @param type
    * @return
    */
   List<RedPackWinInvite> query(@Param("start")long start, @Param("count")int count, @Param("key")String key, @Param("type")String type);

   Long count(@Param("key")String key, @Param("type")String type);

}