From 9212801fbac08dd12b8205c217bdeb925529ab7c Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期四, 27 二月 2025 09:55:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java index ead39b0..4628ee2 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java @@ -164,7 +164,7 @@ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE) ); jsonObject.append("edgOneTasks", edgOneTasks); - jsonObject.append("edgOneTasks", edgTwoTasks); + jsonObject.append("edgTwoTasks", edgTwoTasks); List<Engineering> engineeringOne = engineeringService.list( new LambdaQueryWrapper<Engineering>() .eq(Engineering::getStationCell, 5) -- Gitblit v1.8.0