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

 import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;

-import java.time.LocalDateTime;

@Data
 public class EvaluationCriteriaResponseBean extends LookUpDataResponse{