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

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

@@ -154,7 +154,7 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 
 				List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities = groupedByLoadId.get(key);
 				//干线发车
-				nodeInfoVO = buildTrunklineByLoadCar(trunklineCarsLoadScanEntities, listByLoadId         );
+				nodeInfoVO = buildTrunklineByLoadCar(trunklineCarsLoadScanEntities, listByLoadId  );
 				if (nodeInfoVO != null) {
 					nodeInfoVOList.add(nodeInfoVO);
 				}
@@ -208,7 +208,7 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 				if(qualityDeliverEntity != null){
 					nodeInfoVO = new NodeInfoVO();
 					nodeInfoVO.setOperateName("配送签收");
-					nodeInfoVO.setOperateNumber(signNum + "/" + loadNum);
+					nodeInfoVO.setOperateNumber(signNum +"");
 					nodeInfoVO.setOperateWarehouseName(qualityDeliverEntity.getWarehouseName());
 					nodeInfoVO.setOperateTime(qualityDeliverEntity.getSignTime());
 					// 增加网点电话