冲突

yujian

2019-08-30 ffbd3afe3806bfdbb13487f6031b938cb1ebcf9b

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

@@ -25,4 +25,22 @@
    * @return
    */
   List<UserSystemCouponGiveRecord> overdueList(@Param("count") int count);
	
	
   /**
    * 赠送超时未领取的
    * @param count
    * @return
    */
   List<UserSystemCouponGiveRecord> overdueListByUser(@Param("uid") Long uid);
	
	
	
   /**
    * 领取的id
    * @param count
    * @return
    */
   UserSystemCouponGiveRecord getByReceiveId(@Param("receiveId") Long receiveId);
	
}