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/model/request/EvaluationCriteriaReq.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaReq.java
@@ -1,7 +1,9 @@
 package net.gepafin.tendermanagement.model.request;

 import lombok.Data;
+import lombok.NoArgsConstructor;

+@NoArgsConstructor
@Data
 public class EvaluationCriteriaReq extends LookUpDataReq{