Resolved conflicts

2024-08-30 18:54:16 +05:30
parent 18c40eaf03 98d1405a7c
commit 5ed23848bb
22 changed files with 202 additions and 143 deletions
--- a/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java
@@ -1,5 +1,6 @@
 package net.gepafin.tendermanagement.repositories;

+import net.gepafin.tendermanagement.entities.EvaluationCriteriaEntity;
 import net.gepafin.tendermanagement.entities.FaqEntity;

 import java.util.List;
@@ -17,4 +18,6 @@ public interface FaqRepository extends JpaRepository<FaqEntity, Long> {
 	Optional<FaqEntity> findById(@Param("id") Long id);

 	List<FaqEntity> findByCallIdAndIsDeletedFalse(Long callId);
+	
+	List<FaqEntity> findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long callId, String type);
 }