Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

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

@@ -46,4 +46,11 @@
    */

   List<UserSystemCouponRecord> getCouponByUsingTimeOut(@Param("uid") Long uid, @Param("number") Long number);

   

	
   /**

    * 查询最近使用记录

    * @param userCouponId

    * @return

    */

   UserSystemCouponRecord getNearByUserCouponId(@Param("userCouponId") Long userCouponId);

}