Resolved conflicts

This commit is contained in:
nisha
2025-02-17 16:37:34 +05:30
112 changed files with 3861 additions and 293 deletions

View File

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