From c5ea9b5f05e2c71abfb6b3e887e6303d488b0dd7 Mon Sep 17 00:00:00 2001
From: "kelvin.yau" <kelvin.yau@2fi-solutions.com.hk>
Date: Tue, 19 May 2026 13:56:51 +0800
Subject: [PATCH] merge fix

---
 .../modules/deliveryOrder/service/DoWorkbenchMainService.kt  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt
index 4e15dad..e859e3c 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt
@@ -1523,11 +1523,6 @@ return MessageResponse(
                 dop.deliveryNoteCode = CodeGenerator.generateNo(prefix = prefix, midfix = midfix, latestCode = latestCode)
             }
             deliveryOrderPickOrderRepository.save(dop)
-<<<<<<< HEAD
-
-=======
-            
->>>>>>> e9f1f48edb57d3696af3ffb23bc40d9644c8c44f
         }
         markDeliveryOrdersCompletedForDeliveryOrderPickOrder(deliveryOrderPickOrderId)
         return MessageResponse(