Resolved Conflicts

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

@@ -0,0 +1,25 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Entity
+@Table(name = "s3_path_configuration")
+@Data
+public class S3ConfigEntity extends BaseEntity {
+
+    @Column(name = "TYPE")
+    private String type;
+
+    @Column(name = "PATH")
+    private String path;
+
+    @Column(name = "BUCKET_NAME")
+    private String bucketName;
+
+    @Column(name = "PARENT_FOLDER")
+    private String parentFolder;
+}
+