Resolved conflicts
This commit is contained in:
@@ -134,7 +134,12 @@ public class UserServiceImpl implements UserService {
|
||||
|
||||
@Override
|
||||
public PageableResponseBean<List<UserResponseBean>> getUserByPagination(HttpServletRequest request, UserPaginationRequestBean userPaginationRequestBean) {
|
||||
UserEntity user=validator.validateUser(request);
|
||||
return userDao.getUserByPagination(userPaginationRequestBean,user);
|
||||
UserEntity user = validator.validateUser(request);
|
||||
return userDao.getUserByPagination(userPaginationRequestBean, user);
|
||||
}
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq) {
|
||||
return userDao.updateUserDetails(request , userId, userReq);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user