Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

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

   }