Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -853,7 +853,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				DeliveryNodeVo assignStockUpNodeVo = new DeliveryNodeVo();
 				assignStockUpNodeVo.setNodeName(StockUpNode.yizhipai.getName());
 				assignStockUpNodeVo.setTime(distributionStockupEntity.getAssignTime());
-				assignStockUpNodeVo.setNodeInfo("指派"+distributionStockupEntity.getLoaderName()+"计划备货"+stockUpPlanNum+"件;");
+				assignStockUpNodeVo.setNodeInfo("指派"+distributionStockupEntity.getForkliftName()+"计划备货"+stockUpPlanNum+"件;");
 				assignStockUpNodeVo.setNodeUserName(userClient.userInfoById(distributionStockupEntity.getCreateUser()).getData().getName());
 				nodeVos.add(assignStockUpNodeVo);
 			}