Merge branch 'div1'

yujian

2019-01-14 c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f

 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);
	
}