Merge branch 'master' into div

yujian

2019-07-11 21f2f635fefa3dcfd38f364c2a9d50c54360899c

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



}