From 5797fc7e8267d634ee64fd27cdea2a834091681e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 11:10:24 +0800
Subject: [PATCH] Merge branch 'master' into dev-msg
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index 2853b50..edd3b33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -139,6 +139,15 @@
* 缁熻鏂板鐢ㄦ埛
* @return
*/
- List<Map<String, Object>> countNewUserByDate(@Param("type")Integer type, @Param("years") String years,
+ List<Map<String, Object>> countNewUserByDate(@Param("channel")String channel,@Param("type")Integer type, @Param("years") String years,
@Param("startTime")String startTime, @Param("endTime")String endTime);
+
+
+ /**
+ * 缁熻鏂板鐢ㄦ埛
+ * @return
+ */
+ List<Map<String, Object>> getTodayHasOrder(@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