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

yujian

2020-04-15 53672fd62a2084c8b3f8e7ce69e617ff9be58276

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

@@ -28,6 +28,6 @@
    * @param date

    * @return

    */

   Long countActiveNumByDate(@Param("date") String date);

   Long countActiveNumByDate(@Param("preDay") String preDay);

   

}