Merge remote-tracking branch 'origin/master'

yujian

2019-03-06 7c3277e2b1255d5948fb3c542db1ba5aff8ad0e1

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java

@@ -25,7 +25,7 @@
    * @param seconds

    * @return

    */

   public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, long seconds);

   public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, Long seconds);



   /**

    * 查询状态