From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
index 11b80d5..6214aaf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
@@ -255,6 +255,7 @@
/**
* 缁熻鐢ㄦ埛绾㈠寘鏁伴噺
+ *
* @param uid
* @param type
* @param state
@@ -265,24 +266,24 @@
long selectCountByTypeAndStateAndCreateTime(@Param("uid") Long uid, @Param("type") List<Integer> type,
@Param("state") List<Integer> state, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
-
/**
- * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
+ * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
+ *
* @param channel
* @return
*/
- List<Map<String, Object>> count24HOderByChannel(@Param("channel")String channel,
- @Param("type")Integer type, @Param("years") String years,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
+ List<Map<String, Object>> count24HOderByChannel(@Param("channel") String channel, @Param("type") Integer type,
+ @Param("years") String years, @Param("startTime") String startTime, @Param("endTime") String endTime);
-
/**
- * 鏍规嵁娓犻亾 缁熻鍘嗗彶浜х敓鐨勮鍗曟暟閲�
+ * 鏍规嵁娓犻亾 缁熻鍘嗗彶浜х敓鐨勮鍗曟暟閲�
+ *
* @param channel
* @return
*/
- List<Map<String, Object>> countHistoryOderByChannel(@Param("channel")String channel,
- @Param("type")Integer type, @Param("years") String years,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
-
+ List<Map<String, Object>> countHistoryOderByChannel(@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