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

admin

2020-06-19 bf210f3c96bc092c182bdeb24bdb9b03d4096707

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

   

}