Merge branch 'dev' into pre-production

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

@@ -1540,6 +1540,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 						NodePushMsg msg = new NodePushMsg();
 						msg.setNode(WorkNodeEnums.CLERK_REVIEW);
 						msg.setBrand(BrandEnums.MTMM);
+						msg.setWarehouse(warehouseName);
 						msg.setOperator(AuthUtil.getNickName());
 						msg.setOperatorTime(new Date());
 						msg.setContent(mtReceiveDTO.getReceiveContentList().stream().map(m ->{

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/service/impl/FactoryNodePushServiceImpl.java

@@ -91,6 +91,7 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl<FactoryNodePushM
 					int resultCode = entries.getInt("Result");
 					// 存入日志表
 					factoryNodePushEntity.setSendStatus(Convert.toStr(resultCode));
+					factoryNodePushEntity.setResultContent(resBody);
 					baseMapper.updateById(factoryNodePushEntity);
 					return Boolean.TRUE;
 				}