Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt

src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt

@@ -3,11 +3,13 @@ package com.ffii.fpsms.modules.jobOrder.entity
 import com.ffii.core.support.AbstractRepository
 import com.ffii.fpsms.modules.jobOrder.entity.projections.JobOrderDetailWithJsonString
 import com.ffii.fpsms.modules.jobOrder.entity.projections.JobOrderInfo
+import com.ffii.fpsms.modules.jobOrder.enums.JobOrderStatus
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import java.time.LocalDateTime
+import com.ffii.fpsms.modules.jobOrder.enums.JobOrderStatus.*
 @Repository
 interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
     @Query("""
@@ -134,6 +136,9 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
         pageable: Pageable
     ): Page<JobOrderInfo>
 
+<<<<<<< HEAD
+    fun findAllByStatusIn(statuses: List<JobOrderStatus>): List<JobOrder>
+=======
     @Query(
         nativeQuery = true,
         value = """
@@ -172,4 +177,5 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
         """
     )
     fun findJobOrderByProdScheduleLineId(prodScheduleLineId: Long): JobOrderDetailWithJsonString?;
+>>>>>>> origin/master
 }