From bbb7a538df960f2f47b0af8c3db03622fca08d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 五月 2020 13:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderUserMapMapper.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderUserMapMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderUserMapMapper.java
index c50ea6a..434fa94 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderUserMapMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderUserMapMapper.java
@@ -90,13 +90,16 @@
* @return
*/
List<TeamDividentsVO> listByDateAndTargetUid(@Param("start") long start, @Param("count") int count,
- @Param("targetUid") Long targetUid, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
+ @Param("targetUid") Long targetUid, @Param("minTime") Date minTime,
+ @Param("maxTime") Date maxTime, @Param("key")String key);
- Long countByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
+ Long countByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime,
+ @Param("maxTime") Date maxTime, @Param("key")String key);
- TeamDividentsVO sumByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
+ TeamDividentsVO sumByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime,
+ @Param("maxTime") Date maxTime , @Param("key")String key);
}
\ No newline at end of file
--
Gitblit v1.8.0