Merge branch 'mater-1.6.0' into div

admin

2019-08-23 91526d285399c7bf93588b6be910c3b849cab7e3

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



}