resolved conflicts

2024-08-28 02:14:04 +05:30
parent 22e72f6cd4 21fc9a4b91
commit f96fcd3a76
23 changed files with 234 additions and 69 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java
@@ -18,7 +18,9 @@ public class CreateCallResponseBean {

    private String descriptionLong;

-    private List<LocalDateTime> dates;
+    private LocalDateTime startDate;
+    
+    private LocalDateTime endDate;

    private CallTypeEnum status;