Resolved conflicts

2024-11-15 20:06:33 +05:30
parent 7485cead14 3d107e65fb
commit f4034534d7
23 changed files with 362 additions and 242 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryPreferredCallEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryPreferredCallEntity.java
@@ -34,4 +34,6 @@ public class BeneficiaryPreferredCallEntity extends BaseEntity{

    @Column(name = "STATUS", length = 255)
    private String status;
+    @Column(name="IS_DELETED")
+    private Boolean isDeleted;
 }