Merge branch 'div_8'

yujian

2019-05-14 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java

@@ -54,7 +54,7 @@
   }



   @Override

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

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

      return userSystemCouponRecordMapper.getCouponByUsingTimeOut(uid, seconds);

   }