resolved conflicts

2024-10-17 16:05:30 +05:30
parent 4412e447fb 863e2db68d
commit 01e589ec6d
23 changed files with 174 additions and 28 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java
@@ -22,4 +22,7 @@ public class UserWithCompanyEntity extends BaseEntity{
    @Column(name = "IS_LEGAL_REPRESENTANT")
    private Boolean isLegalRepresentant;

+	@Column(name = "IS_DELETED")
+	private Boolean isDeleted = false;
+
 }