Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 0d6ae37c7f09949199d84e20a927b44294f7fa9f

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

@@ -33,8 +33,11 @@


   @Override

   public UserActiveLog getUserLatestActiveInfo(Long uid) {



      return userActiveLogMapper.selectLatestByUid(uid);

   }



	
	
	
	
}