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

yujian

2019-05-08 5e88359d7210039a6b1525bd5ffc20f24f2b5e01

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

   }



	
	
	
	
}