From 37e8ba46879a6094938ad685b1054eb6446ae749 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 五月 2020 19:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderUserMapService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderUserMapService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderUserMapService.java
index a46e15b..af21abc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderUserMapService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderUserMapService.java
@@ -170,10 +170,10 @@
 	 * @param maxTime
 	 * @return
 	 */
-	public List<TeamDividentsVO> listByDateAndTargetUid(long start, int count, Long targetUid, Date minTime, Date maxTime);
+	public List<TeamDividentsVO> listByDateAndTargetUid(long start, int count, Long targetUid, Date minTime, Date maxTime, String key);
 
-	public long countByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime);
+	public long countByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime, String key);
 
-	public TeamDividentsVO sumByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime);
+	public TeamDividentsVO sumByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime, String key);
 
 }

--
Gitblit v1.8.0