Resolved conflicts

2025-03-05 20:37:35 +05:30
parent e937f33aeb d1153333ce
commit 69c8726d40
22 changed files with 464 additions and 79 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/request/CallPageableRequestBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/CallPageableRequestBean.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import net.gepafin.tendermanagement.enums.CallStatusEnum;

 import java.util.List;
+import java.util.Map;

@Data
 public class CallPageableRequestBean {
@@ -11,4 +12,6 @@ public class CallPageableRequestBean {
    private GlobalFilters globalFilters;

    private List<CallStatusEnum> status;
+
+    private Map<String, FilterCriteria> filters;
 }