冲突产生的文件

yujian

2019-06-25 e048db91382fa13e0b53e170390eea5fb5931221

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

   }



	
	
	
	
}