Resolved conflict

2025-09-30 20:24:55 +05:30
parent 53500decd7
commit 193283e99a
27 changed files with 523 additions and 77 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationFormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationFormDao.java
@@ -145,7 +145,7 @@ public class EvaluationFormDao {


    }
-    public EvaluationFormResponseBean getEvaluationFormByCallId(CallEntity callEntity) {
+    public EvaluationFormResponseBean  getEvaluationFormByCallId(CallEntity callEntity) {
        if (callEntity == null) {
            throw new CustomValidationException(Status.VALIDATION_ERROR,
                    Translator.toLocale(GepafinConstant.CALL_NOT_FOUND));