Resolved conflicts while syncing with the master branch

2024-12-20 11:30:49 +05:30
parent 524c770641 10ea351fbb
commit c02e421eb6
5 changed files with 13 additions and 7 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -1805,6 +1805,7 @@ public class ApplicationEvaluationDao {
 				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 						Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_NOT_FOUND)));
 	}
+    
    public ApplicationEvaluationResponse updateApplicationEvaluation(
            Long assignedApplicationId,
            List<EvaluationDocumentRequest> docRequest) {