冲突解决

@@ -924,9 +924,10 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
         }
         orderInfo.setPurchaseOrderLineList(orderLineList);
         orderInfo.setPurchaseOrderLineList(orderLineList);
         if (CollectionUtils.isNotEmpty(proProcessList)) {
         if (CollectionUtils.isNotEmpty(proProcessList)) {
-            orderInfo.setProductionProcess(String.join("\n\n", proProcessList));
+            orderInfo.setProductionProcess(String.join("\n", proProcessList));
         }
         }
-        return String.join("\n", proProcessList);
+
+        return orderInfo;
     }
     }
 
 
     @Override
     @Override
@@ -935,8 +936,6 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             return new ReviewerDto();
             return new ReviewerDto();
         }
         }
         return getBaseMapper().getReviewerById(id);
         return getBaseMapper().getReviewerById(id);
-
-        return orderInfo;
     }
     }