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

@@ -185,6 +185,7 @@ public class EmailNotificationDao {
EmailConfig emailConfig = retrieveEmailConfig(hubId);
EmailService emailService = emailServiceFactory.getEmailService(emailConfig.getEmailServiceType());
emailService.sendEmail(subject, body, recipientEmails, emailConfig,emailLogRequest);
// emailService.sendEmail(subject, body, recipientEmails, emailConfig);
}
public EmailConfig retrieveEmailConfig(Long hubId) {