Merge branch 'master' into div

yujian

2019-07-11 1510301f5673631ad24fb5634bff5d504eda5ccd

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

@@ -33,8 +33,18 @@


   @Override

   public UserActiveLog getUserLatestActiveInfo(Long uid) {



      return userActiveLogMapper.selectLatestByUid(uid);

   }



   @Override

   public UserActiveLog getFirstActiveInfo(Long uid) {

		
		
      return userActiveLogMapper.selectFirstActiveInfo(uid);

   }



	
	
	
	
}