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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

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

   }