resolved conflicts

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;
 }