Resolved conflicts

2024-11-28 13:04:43 +05:30
parent 35669bae39 3b5069737c
commit 62d1c62385
24 changed files with 288 additions and 140 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryPreferredCallResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryPreferredCallResponseBean.java
@@ -20,6 +20,7 @@ public class BeneficiaryPreferredCallResponseBean {
    private BeneficiaryCallStatus status;
    private LocalDateTime createdDate;
    private LocalDateTime updatedDate;
+    private Long userWithCompanyId;


 }