Resolved conflicts

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationSignedDocumentResponse.java

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationSignedDocumentStatusEnum;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+@Data
+public class ApplicationSignedDocumentResponse extends BaseBean{
+	
+    private Long applicationId;
+    private String fileName;
+    private String filePath;
+    private ApplicationSignedDocumentStatusEnum status;
+}

src/main/java/net/gepafin/tendermanagement/model/response/CompanyDelegationResponse.java

@@ -3,9 +3,10 @@ package net.gepafin.tendermanagement.model.response;
 import lombok.Data;
 import net.gepafin.tendermanagement.entities.BaseEntity;
 import net.gepafin.tendermanagement.enums.UserCompanyDelegationStatusEnum;
+import net.gepafin.tendermanagement.model.BaseBean;
 
 @Data
-public class CompanyDelegationResponse extends BaseEntity{
+public class CompanyDelegationResponse extends BaseBean{
     private Long userId;
     private Long companyId;
     private Long beneficiaryId;

src/main/java/net/gepafin/tendermanagement/model/response/SystemEmailTemplateResponse.java

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.model.response;
+
+import java.util.Map;
+
+import lombok.Data;
+
+@Data
+public class SystemEmailTemplateResponse {
+
+    String htmlContent;
+
+    String subject;
+
+    Map<String, String> jsonMap;
+
+}

src/main/java/net/gepafin/tendermanagement/model/response/UploadFileOnAmazonS3Response.java

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class UploadFileOnAmazonS3Response {
+	
+	private String fileName;
+	
+	private String filePath;
+
+}