From 5aeec2b48b5c3f1ed9d9ecf8b95a8ddc2031d43d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 三月 2019 14:15:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
index 7c51f69..971ef8c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
+++ b/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);
 	}
 

--
Gitblit v1.8.0