Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-17 07a2639739705af4e2f8676d18fdcc10739b0474

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

   }