From 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 十一月 2019 18:51:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java |  136 ++++++++++++++++++++++++---------------------
 1 files changed, 72 insertions(+), 64 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java
index a2f53c4..9c87fac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/FloatADMapper.java
@@ -1,65 +1,73 @@
-package com.yeshi.fanli.dao.mybatis.homemodule;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
-
-public interface FloatADMapper extends BaseMapper<FloatAD>{
-	
-	/**
-	 * 鎵归噺鍒犻櫎
-	 * @param list
-	 * @return
-	 */
-	int deleteByPrimaryKeyList(List<Long> list);
-	
-	/**
-	 * 鏍规嵁涓婚敭鏌ヨ
-	 * @param list
-	 * @return
-	 */
-	List<FloatAD> ListByPrimaryKey(List<Long> list);
-	
-	
-   /**
-           *  鍚庣鍒楄〃鏌ヨ
-    * @param start
-    * @param count
-    * @param key
-    * @param state
-    * @return
-    */
-	List<FloatAD> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key,
-			@Param("state") Integer state);
-	
-	long countQuery(@Param("key") String key, @Param("state") Integer state);
-	
-	/**
-	 * 鑾峰彇鐩搁偦搴忓彿
-	 * @param position
-	 * @param type
-	 * @return
-	 */
-	FloatAD getByAdjoinOrder(@Param("position") String position, @Param("order") Integer order,
-			@Param("type") Integer type);
-	
-	/**
-	 * 鏍规嵁浣嶇疆缁熻涓暟
-	 * @param position
-	 * @return
-	 */
-	int getMaxOrderByPosition(@Param("position") String position);
-
-	/**
-	 * 鏌ヨ鏈夋晥寮瑰嚭妗�
-	 * @param position
-	 * @return
-	 */
-	FloatAD getEffectiveFloatAD(@Param("position") String position, @Param("type") Integer type);
-
-}
-	
+package com.yeshi.fanli.dao.mybatis.homemodule;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
+
+public interface FloatADMapper extends BaseMapper<FloatAD>{
+	
+	/**
+	 * 鎵归噺鍒犻櫎
+	 * @param list
+	 * @return
+	 */
+	int deleteByPrimaryKeyList(List<Long> list);
+	
+	/**
+	 * 鏍规嵁涓婚敭鏌ヨ
+	 * @param list
+	 * @return
+	 */
+	List<FloatAD> ListByPrimaryKey(List<Long> list);
+	
+	
+   /**
+           *  鍚庣鍒楄〃鏌ヨ
+    * @param start
+    * @param count
+    * @param key
+    * @param state
+    * @return
+    */
+	List<FloatAD> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key,
+			@Param("state") Integer state);
+	
+	long countQuery(@Param("key") String key, @Param("state") Integer state);
+	
+	/**
+	 * 鑾峰彇鐩搁偦搴忓彿
+	 * @param position
+	 * @param type
+	 * @return
+	 */
+	FloatAD getByAdjoinOrder(@Param("position") String position, @Param("order") Integer order,
+			@Param("type") Integer type);
+	
+	/**
+	 * 鏍规嵁浣嶇疆缁熻涓暟
+	 * @param position
+	 * @return
+	 */
+	int getMaxOrderByPosition(@Param("position") String position);
+
+	/**
+	 * 鏌ヨ鏈夋晥寮瑰嚭妗�
+	 * @param position
+	 * @return
+	 */
+	FloatAD getEffectiveFloatAD(@Param("position") String position, @Param("type") Integer type);
+	
+	
+	/**
+	 * 鏌ヨ鏈夋晥寮瑰嚭妗�
+	 * @param position
+	 * @return
+	 */
+	List<FloatAD> getValidFloatAD(@Param("position") String position, @Param("type") Integer type);
+
+}
+	
 	
\ No newline at end of file

--
Gitblit v1.8.0