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/UserRankingsMapper.java |  124 ++++++++++++++++++++--------------------
 1 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserRankingsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserRankingsMapper.java
index 2316319..7fcdb5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserRankingsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserRankingsMapper.java
@@ -1,63 +1,63 @@
-package com.yeshi.fanli.dao.mybatis;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.bus.user.UserRankings;
-
-public interface UserRankingsMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(UserRankings record);
-
-	int insertSelective(UserRankings record);
-
-	UserRankings selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(UserRankings record);
-
-	int updateByPrimaryKey(UserRankings record);
-	
-	
-	/**
-	 * 鎵归噺鎻掑叆
-	 * @param list
-	 * @return
-	 */
-	int insertBatch(List<UserRankings> list);
-	
-	
-	/**
-	 * 鎵归噺閫夋嫨鏇存柊
-	 * @param list
-	 * @return
-	 */
-	int updateBatchSelective(List<UserRankings> list);
-	
-	
-	List<UserRankings> queryAll();
-	
-	/**
-	 * 娓呯┖鑷喘姒滅姸鎬佷互鍙婇噾棰�
-	 */
-	void updateClearTradeState();
-	
-	// 鏍规嵁鍚嶇О鏌ヨ
-	List<UserRankings> selectByNickName(String nickName);
-	
-	// 鏍规嵁灞曠ずID鏌ヨ
-	List<UserRankings> selectByShowId(String showId);
-		
-		
-	// 鏌ヨ鍒楄〃
-	List<UserRankings> query(@Param("start") long start, @Param("count") int count, @Param("key") String key,
-			 @Param("tradeState") Integer tradeState, @Param("shareState") Integer shareState, @Param("sort") Integer sort);
-	
-	// 鏌ヨ鍒楄〃缁熻
-	long queryCount(@Param("key") String key,  @Param("tradeState") Integer tradeState, @Param("shareState") Integer shareState);
-	
-	// 濂栭噾姒� 闅忔満id鏌ヨ
-	public List<UserRankings> listQueryByIds(List<Long> list);
+package com.yeshi.fanli.dao.mybatis;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.bus.user.UserRankings;
+
+public interface UserRankingsMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(UserRankings record);
+
+	int insertSelective(UserRankings record);
+
+	UserRankings selectByPrimaryKey(Long id);
+
+	int updateByPrimaryKeySelective(UserRankings record);
+
+	int updateByPrimaryKey(UserRankings record);
+	
+	
+	/**
+	 * 鎵归噺鎻掑叆
+	 * @param list
+	 * @return
+	 */
+	int insertBatch(List<UserRankings> list);
+	
+	
+	/**
+	 * 鎵归噺閫夋嫨鏇存柊
+	 * @param list
+	 * @return
+	 */
+	int updateBatchSelective(List<UserRankings> list);
+	
+	
+	List<UserRankings> queryAll();
+	
+	/**
+	 * 娓呯┖鑷喘姒滅姸鎬佷互鍙婇噾棰�
+	 */
+	void updateClearTradeState();
+	
+	// 鏍规嵁鍚嶇О鏌ヨ
+	List<UserRankings> selectByNickName(String nickName);
+	
+	// 鏍规嵁灞曠ずID鏌ヨ
+	List<UserRankings> selectByShowId(String showId);
+		
+		
+	// 鏌ヨ鍒楄〃
+	List<UserRankings> query(@Param("start") long start, @Param("count") int count, @Param("key") String key,
+			 @Param("tradeState") Integer tradeState, @Param("shareState") Integer shareState, @Param("sort") Integer sort);
+	
+	// 鏌ヨ鍒楄〃缁熻
+	long queryCount(@Param("key") String key,  @Param("tradeState") Integer tradeState, @Param("shareState") Integer shareState);
+	
+	// 濂栭噾姒� 闅忔満id鏌ヨ
+	public List<UserRankings> listQueryByIds(List<Long> list);
 }
\ No newline at end of file

--
Gitblit v1.8.0