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/ConfigMapper.java |   87 ++++++++++++++++++++++---------------------
 1 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ConfigMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ConfigMapper.java
index 079cda9..13474c8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ConfigMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ConfigMapper.java
@@ -1,43 +1,46 @@
-package com.yeshi.fanli.dao.mybatis;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.common.Config;
-
-public interface ConfigMapper extends BaseMapper<Config> {
-
-	/**
-	 * 鑾峰彇鎵�鏈夐厤缃�
-	 * 
-	 * @return
-	 */
-	List<Config> listAll();
-
-	/**
-	 * 閫氳繃鍚嶅瓧鎼滅储
-	 * 
-	 * @param key
-	 * @return
-	 */
-	List<Config> listSearchByName(@Param("key") String key, @Param("start") int start, @Param("count") int count);
-
-	/**
-	 * 鑾峰彇閫氳繃鍚嶅瓧鎼滅储寰楀埌鐨勬暟閲�
-	 * 
-	 * @param key
-	 * @return
-	 */
-	long countSearchByName(@Param("key") String key);
-
-	/**
-	 * 鏍规嵁鍏抽敭璇嶈幏鍙�
-	 * 
-	 * @param key
-	 * @return
-	 */
-	List<Config> listByKey(String key);
-
+package com.yeshi.fanli.dao.mybatis;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.common.Config;
+
+public interface ConfigMapper extends BaseMapper<Config> {
+
+	/**
+	 * 鑾峰彇鎵�鏈夐厤缃�
+	 * 
+	 * @return
+	 */
+	List<Config> listAll();
+
+	/**
+	 * 閫氳繃鍚嶅瓧鎼滅储
+	 * 
+	 * @param key
+	 * @return
+	 */
+	List<Config> listSearchByName(@Param("key") String key, @Param("start") int start, @Param("count") int count);
+
+	/**
+	 * 鑾峰彇閫氳繃鍚嶅瓧鎼滅储寰楀埌鐨勬暟閲�
+	 * 
+	 * @param key
+	 * @return
+	 */
+	long countSearchByName(@Param("key") String key);
+
+	/**
+	 * 鏍规嵁鍏抽敭璇嶆彁鍙�
+	 * 
+	 * @param key
+	 * @param minAndroidVersion
+	 * @param maxAndroidVersion
+	 * @return
+	 */
+	List<Config> listByKey(@Param("key") String key, @Param("minAndroidVersion") Integer minAndroidVersion,
+			@Param("minIosVersion") Integer minIosVersion);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0