Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-26 b2e7e9ed88acb0e0ea50571ae028199926b7d262

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

   }