Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponGiveRecordMapper.java

@@ -1,5 +1,7 @@
package com.yeshi.fanli.dao.mybatis.user;

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
@@ -16,4 +18,11 @@
    */
   UserSystemCouponGiveRecord getRecordByUidAndCouponId(@Param("uid") Long uid, @Param("couponId") Long couponId);
   
	
   /**
    * 赠送超时未领取的
    * @param count
    * @return
    */
   List<UserSystemCouponGiveRecord> overdueList(@Param("count") int count);
}