From 0272ffc3e7037e10c2ddadeea6c597850903878f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 八月 2019 14:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java |    5 -----
 1 files changed, 0 insertions(+), 5 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 8efffc1..376059e 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,11 +54,6 @@
 	}
 
 	@Override
-	public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, Long seconds) {
-		return userSystemCouponRecordMapper.getCouponByUsingTimeOut(uid, seconds);
-	}
-
-	@Override
 	public boolean isSuccessMianDan(Integer source, String orderId) {
 		List<String> orderList = new ArrayList<>();
 		orderList.add(orderId);

--
Gitblit v1.8.0