From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackConfigMapper.java |   74 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackConfigMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackConfigMapper.java
index 49456c0..7975b5e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackConfigMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackConfigMapper.java
@@ -1,38 +1,38 @@
-package com.yeshi.fanli.dao.mybatis.redpack;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.redpack.RedPackConfig;
-
-public interface RedPackConfigMapper extends BaseMapper<RedPackConfig> {
-	/**
-	 * 鏍规嵁key鍊兼煡璇�
-	 * @param key
-	 * @return
-	 */
-	RedPackConfig getByKey(@Param("key") String key,@Param("startTime")Date startTime);
-	
-	
-	/**
-	 * 鍒楄〃鏌ヨ
-	 * 
-	 * @param key
-	 * @param state
-	 * @param count
-	 * @return
-	 */
-	List<RedPackConfig> query(@Param("start") long start,@Param("count") int count, @Param("key") String key);
-
-	/**
-	 * 璁℃暟
-	 * 
-	 * @param key
-	 * @param state
-	 * @return
-	 */
-	long count(@Param("key") String key);
+package com.yeshi.fanli.dao.mybatis.redpack;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.redpack.RedPackConfig;
+
+public interface RedPackConfigMapper extends BaseMapper<RedPackConfig> {
+	/**
+	 * 鏍规嵁key鍊兼煡璇�
+	 * @param key
+	 * @return
+	 */
+	RedPackConfig getByKey(@Param("key") String key,@Param("startTime")Date startTime);
+	
+	
+	/**
+	 * 鍒楄〃鏌ヨ
+	 * 
+	 * @param key
+	 * @param state
+	 * @param count
+	 * @return
+	 */
+	List<RedPackConfig> query(@Param("start") long start,@Param("count") int count, @Param("key") String key);
+
+	/**
+	 * 璁℃暟
+	 * 
+	 * @param key
+	 * @param state
+	 * @return
+	 */
+	long count(@Param("key") String key);
 }
\ No newline at end of file

--
Gitblit v1.8.0