Resolved conflicts
This commit is contained in:
@@ -103,9 +103,6 @@ public class ApplicationDao {
|
||||
@Value("${default_System_Receiver_Email}")
|
||||
private String defaultSystemReceiverEmail;
|
||||
|
||||
@Value("${gepafin_email}")
|
||||
private String gepafinEmail;
|
||||
|
||||
@Value("${rinaldo_email}")
|
||||
private String rinaldoEmail;
|
||||
|
||||
@@ -851,7 +848,7 @@ public class ApplicationDao {
|
||||
// mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
|
||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail));
|
||||
}
|
||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(gepafinEmail));
|
||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()));
|
||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(defaultSystemReceiverEmail));
|
||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user