resolved conflicts

src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java

@@ -1,7 +1,5 @@
 package net.gepafin.tendermanagement.model.request;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
@@ -9,14 +7,12 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 @Getter
 @Setter
 public class UserReq {
 
-    @NotBlank(message = "{email.not.blank}")
-    @Email(message = "{email.invalid}")
+    @NotBlank
+    @Email
     private String email;
     @NotEmpty
     private String password;
@@ -28,7 +24,7 @@ public class UserReq {
     private String lastName;
 
     private String phoneNumber;
-    @NotEmpty
+    @NotNull
     private Long roleId;
 
     private String organization;