冲突

yujian

2019-05-09 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22

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

@@ -44,6 +44,6 @@
    * @param seconds
    * @return
    */
   List<UserSystemCouponRecord> getCouponByUsingTimeOut(@Param("uid") Long uid,@Param("seconds") long seconds);
   List<UserSystemCouponRecord> getCouponByUsingTimeOut(@Param("uid") Long uid, @Param("number") Long number);
   
}