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

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

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

   }



	
	
	
	
}