resolved conflicts

2024-08-28 02:14:04 +05:30
parent 22e72f6cd4 21fc9a4b91
commit f96fcd3a76
23 changed files with 234 additions and 69 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java
@@ -8,9 +8,6 @@ import lombok.Data;
@Data
 public class CreateCallRequestStep2 {

-	@NotNull
-	private Long callId;
-
    private Long threshold;

    @NotNull