diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
index 485e137..55eed14 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
@@ -190,11 +190,7 @@ const validateForm = (): boolean => {
   }
   
   // 2. 检查 actualPickQty 不能超过可用数量或需求数量
-<<<<<<< Updated upstream
   if (ap > Math.min(req)) {
-=======
-  if (ap > Math.min( req)) {
->>>>>>> Stashed changes
     newErrors.actualPickQty = t('Qty is not allowed to be greater than required/available qty');
   }