Merge branch 'div_16'

yujian

2019-05-14 b70cd48a7295356dc392357e6eb76002bf29771b

 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);



   /**

    * 查询状态