Resolved conflicts

This commit is contained in:
rajesh
2024-11-27 17:01:03 +05:30
77 changed files with 3337 additions and 663 deletions

View File

@@ -83,12 +83,12 @@ public class ApplicationServiceImpl implements ApplicationService {
validator.validateUserWithCompany(request, applicationEntity.getCompanyId());
return flowFormDao.getNextOrPreviousForm(applicationEntity, formId, action);
}
@Override
@Transactional(rollbackFor = Exception.class)
public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) {
return applicationDao.updateApplicationStatus(request, applicationId, status);
return applicationDao.updateApplicationStatus(request, applicationId, status);
}
@Override