From 723f7f30bd818548cb3dc2a75d11e9666cca4f8a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 15:05:11 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
index 3ffe7c0..a5d0d82 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
@@ -1,5 +1,7 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.util.List;
+
 import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 
 /**
@@ -24,4 +26,8 @@
 	 */
 	public UserActiveLog getUserLatestActiveInfo(Long uid);
 
+
+	public List<Object> countSameDayByChannel(String channel, Integer type, String years, String startTime, String endTime)
+			throws Exception;
+
 }

--
Gitblit v1.8.0