Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

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