Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoRegisterMapper.java

@@ -47,11 +47,19 @@
   
   
   /**
    * 根据渠道查询用户id
    * @param channel
    * @return
    */
   List<UserInfoRegister> listByDay(@Param("preDay")String preDay);
	
	
   /**
    * 统计渠道当日新增个数
    * @param channel
    * @param preDay
    * @return
    */
   Integer countByChannelAndDay(@Param("channel")String channel, @Param("preDay")String preDay);
   Long countByChannelAndDay(@Param("channel")String channel, @Param("preDay")String preDay);
   
}