resolved conflicts

2024-08-28 03:02:20 +05:30
parent f96fcd3a76 c702bcda75
commit 5fc8206ecf
50 changed files with 1687 additions and 102 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
@@ -58,4 +58,6 @@ public class UserEntity extends BaseEntity {
    @Column(name = "COUNTRY", length = 50, nullable = true)
    private String country;

+    @Column(name = "RESET_PASSWORD_TOKEN", length = 255, nullable = true)
+    private String resetPasswordToken;
 }