冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

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

   }



	
	
	
	
}