Merge remote-tracking branch 'origin/master'

admin

2019-07-24 84cf08fda72e96440e7b0e4954e43702362b5c17

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java

@@ -24,4 +24,12 @@
    */

   public UserActiveLog getUserLatestActiveInfo(Long uid);



   /**

    * 获取第一次活跃信息

    * 
    * @param uid

    * @return

    */

   public UserActiveLog getFirstActiveInfo(Long uid);



}