resolved conflicts

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

@@ -1,8 +1,8 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
 
-import java.time.LocalDateTime;
 
 @Data
 public class EvaluationCriteriaResponseBean extends LookUpDataResponse{

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

@@ -1,14 +1,13 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
 
 
 import java.time.LocalDateTime;
 
 @Data
-public class FaqResponseBean {
-
-    private Long id;
+public class FaqResponseBean extends BaseBean {
 
     private Long userId;
 
@@ -24,7 +23,4 @@ public class FaqResponseBean {
 
     private LocalDateTime responseDate;
 
-    private LocalDateTime createdDate;
-
-    private LocalDateTime updatedDate;
 }

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

@@ -1,13 +1,10 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
-
-import java.time.LocalDateTime;
+import net.gepafin.tendermanagement.model.BaseBean;
 
 @Data
-public class LookUpDataResponse {
-
-    private Long id;
+public class LookUpDataResponse extends BaseBean {
 
     private Long lookUpDataId;
 
@@ -15,8 +12,4 @@ public class LookUpDataResponse {
 
     private String value;
 
-    private LocalDateTime createdDate;
-
-    private LocalDateTime updatedDate;
-
 }

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+@Data
+public class LookUpDataResponseBean extends BaseBean {
+
+    private String title;
+
+    private String value;
+
+    private LookUpDataTypeEnum type;
+}