Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java

@@ -380,7 +380,7 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		NodeInfoVO nodeInfoVO = new NodeInfoVO();
 		nodeInfoVO.setOperateName("干线到达");
 		nodeInfoVO.setOperateNumber(collect.size() + "");
-		nodeInfoVO.setOperateWarehouseName(trunklineCarsLoadScanEntity.getWarehouseName());
+		nodeInfoVO.setOperateWarehouseName(trunklineCarsLoadScanEntity.getUnloadNodeName());
 		nodeInfoVO.setOperateTime(trunklineCarsLoadScanEntity.getCreateTime());
 		return nodeInfoVO;
 
@@ -400,7 +400,7 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		nodeInfoVO.setOperateName("干线发车");
 		nodeInfoVO.setOperateNumber(collect.size() + "");
 		nodeInfoVO.setOperateWarehouseName(trunklineCarsLoadScanEntity.getWarehouseName());
-		nodeInfoVO.setOperateTime(trunklineCarsLoadScanEntity.getCreateTime());
+		nodeInfoVO.setOperateTime(trunklineCarsLoadScanEntity.getUnloadTime());
 		return nodeInfoVO;
 	}