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

yujian

2020-04-23 2bd2200f209ddb7bcc59b636d9de6f8b3f762958

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

   

}