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

yujian

2020-03-25 010760fd974453a70948fef465284d8c817314f5

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

@@ -52,6 +52,6 @@
    * @param preDay
    * @return
    */
   Integer countByChannelAndDay(@Param("channel")String channel, @Param("preDay")String preDay);
   Long countByChannelAndDay(@Param("channel")String channel, @Param("preDay")String preDay);
   
}