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

admin

2019-09-06 2b35e920a8873ba81530f4d86002a459185725ff

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java

@@ -36,6 +36,13 @@
      return userActiveLogMapper.selectLatestByUid(uid);

   }



   @Override

   public UserActiveLog getFirstActiveInfo(Long uid) {

		
		
      return userActiveLogMapper.selectFirstActiveInfo(uid);

   }