From abf10f6ff36f452b96c56748865eeb2f9ff25880 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Fri, 19 Dec 2025 15:17:22 +0800
Subject: [PATCH] update

---
 .../fpsms/modules/jobOrder/entity/JobOrderRepository.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
index 552e9a6..bb087b8 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
@@ -136,9 +136,9 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
         pageable: Pageable
     ): Page<JobOrderInfo>
 
-<<<<<<< HEAD
+
     fun findAllByStatusIn(statuses: List<JobOrderStatus>): List<JobOrder>
-=======
+
     @Query(
         nativeQuery = true,
         value = """
@@ -177,5 +177,5 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
         """
     )
     fun findJobOrderByProdScheduleLineId(prodScheduleLineId: Long): JobOrderDetailWithJsonString?;
->>>>>>> origin/master
+
 }
\ No newline at end of file