Resolved conflict

2025-09-30 20:24:55 +05:30
parent 53500decd7
commit 193283e99a
27 changed files with 523 additions and 77 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/request/EmailLogRequest.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/EmailLogRequest.java
@@ -6,6 +6,8 @@ import net.gepafin.tendermanagement.enums.EmailEntityTypeEnum;
 import net.gepafin.tendermanagement.enums.EmailServiceTypeEnum;
 import net.gepafin.tendermanagement.enums.RecipientTypeEnum;

+import java.util.List;
+
@Data
 public class EmailLogRequest {

@@ -39,4 +41,6 @@ public class EmailLogRequest {

    private Long userActionId;

+    private List<AttachmentRequest> attachments;
+
 }