Resolved conflicts while sync with master

2025-11-17 15:10:49 +05:30
parent 326ce77e8c 2dbf8bf99f
commit d50f3c5a8a
5 changed files with 12 additions and 12 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -179,6 +179,7 @@ public class EmailNotificationDao {
                .map(DocumentEntity::getFilePath)   // or getUrl()
                .collect(Collectors.toList());

+
        UserWithCompanyEntity userWithCompany=companyService.getUserWithCompany(userEntity.getId(),company.getId());
                String companyEmail = userWithCompany.getEmail();
                String contactEmail = userWithCompany.getContactEmail();