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

admin

2020-05-12 99bc8d6f16357f7c01634b316903058740e96e93

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

   

}