From 248aa38c12a393d12c5ab721ee75fbd5c7dfbb9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 18 四月 2019 12:31:28 +0800
Subject: [PATCH] Merge branch 'div'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java
index 9b732b8..2f54508 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java
@@ -25,7 +25,7 @@
 	 * @param seconds
 	 * @return
 	 */
-	public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, long seconds);
+	public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, Long seconds);
 
 	/**
 	 * 鏌ヨ鐘舵��

--
Gitblit v1.8.0