Merge branch 'dev_4'

yujian

2019-05-14 b1f7380b94ff1189759ed14b563fed6534f73ab0

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



   /**

    * 查询状态