From 3961afdde54c1e86063dd2e0862715999562c52b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 16 八月 2019 14:16:07 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/ConfigTaoLiJinMapper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/ConfigTaoLiJinMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/ConfigTaoLiJinMapper.java
index f730597..14f3c20 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/ConfigTaoLiJinMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/ConfigTaoLiJinMapper.java
@@ -1,5 +1,7 @@
 package com.yeshi.fanli.dao.mybatis.tlj;
 
+import java.util.Date;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.yeshi.fanli.dao.BaseMapper;
@@ -12,5 +14,5 @@
 	 * @param key
 	 * @return
 	 */
-	ConfigTaoLiJin getByKey(@Param("key") String key);
+	ConfigTaoLiJin getByKey(@Param("key") String key,@Param("startTime")Date startTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0