From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
index 21ef522..4e49489 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserActiveLogMapper.java
@@ -1,10 +1,5 @@
 package com.yeshi.fanli.dao.mybatis.user;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 
 public interface UserActiveLogMapper {
@@ -16,19 +11,12 @@
 	int insertSelective(UserActiveLog record);
 
 	UserActiveLog selectByPrimaryKey(Long id);
-	
+
 	UserActiveLog selectLatestByUid(Long uid);
+
+	UserActiveLog selectFirstActiveInfo(Long uid);
 
 	int updateByPrimaryKeySelective(UserActiveLog record);
 
 	int updateByPrimaryKey(UserActiveLog record);
-	
-	/**
-	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
-	 * @param channel
-	 * @return
-	 */
-	List<Map<String, Object>> countSameDayByChannel(@Param("channel")String channel,
-			@Param("type")Integer type, @Param("years") String years, 
-			@Param("startTime")String startTime, @Param("endTime")String endTime);
 }
\ No newline at end of file

--
Gitblit v1.8.0