Resolved conflicts

src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java

@@ -0,0 +1,28 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name = "application_signed_document")
+public class ApplicationSignedDocumentEntity extends BaseEntity {
+	
+    @ManyToOne
+    @JoinColumn(name = "APPLICATION_ID")
+    private ApplicationEntity application;
+	
+    @Column(name = "FILE_NAME")
+    private String fileName;
+
+    @Column(name = "FILE_PATH")
+    private String filePath;
+	
+	@Column(name="STATUS")
+	private String status;
+
+}

src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java

@@ -0,0 +1,56 @@
+package net.gepafin.tendermanagement.entities;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Entity
+@Table(name = "system_email_template")
+@Data
+public class SystemEmailTemplatesEntity extends BaseEntity {
+	
+
+	@Column(name = "TEMPLATE_NAME")
+	private String templateName;
+
+	@Column(name = "TYPE")
+	private String type;
+
+	@Column(name = "HTML_CONTENT", columnDefinition = "TEXT")
+	private String htmlContent;
+	
+	@Column(name = "SUBJECT")
+	private String subject;
+
+	@Column(name = "JSON", columnDefinition = "TEXT")
+	private String json;
+
+	@Column(name = "SYSTEM")
+	private Boolean system;
+	
+    @Column(name ="IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
+    
+	public enum SystemEmailTemplatesEntityTypeEnum {
+
+		APPLICATION_SUBMISSION_TO_USER_AND_COMPANY("APPLICATION_SUBMISSION_TO_USER_AND_COMPANY"),
+		APPLICATION_SUBMISSION_TO_GEPAFIN("APPLICATION_SUBMISSION_TO_GEPAFIN");
+		
+		private String value;
+
+		SystemEmailTemplatesEntityTypeEnum(String value) {
+			this.value = value;
+		}
+
+		@JsonValue
+		public String getValue() {
+			return value;
+		}
+	}
+
+}