resolved conflicts

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

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class BeneficiaryWidgetResponseBean {
+
+    private Long numberOfApplications;
+
+    private Long numberOfCalls;
+
+    private Long numberOfIntegratedDocuments;
+
+
+}

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SuperAdminWidgetResponseBean {
+
+    private  Widget1 widget1;
+
+//    private List<Object[]> widgetBars;
+
+}

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

@@ -0,0 +1,26 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class Widget1 {
+
+    private Long numberOfActiveCalls;
+
+    private Long numberOfResgisteredUsers;
+
+//    private Long preInvestigationQuestions;
+
+    private Long numberOfSubmittedApplications;
+
+    private Long numberOfDraftApplications;
+
+    private Long numberOfCompany;
+
+    private BigDecimal totalActiveFinancing;
+
+}