Resolved conflicts while sync with master

2025-06-20 13:27:33 +05:30
parent 404c700372 04e34f6ca1
commit 98bb4a6874
4 changed files with 8 additions and 2 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java
@@ -9,6 +9,8 @@ import org.hibernate.annotations.Where;

 import java.math.BigDecimal;

+import java.math.BigDecimal;
+

@Entity
@Table(name = "EVALUATION_CRITERIA")
@@ -26,5 +28,8 @@ public class EvaluationCriteriaEntity extends BaseEntity {
    
    @Column(name = "SCORE", nullable = false)
    private BigDecimal score;
+    
+    @Column(name ="IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;

 }