From 4f1992787c2ec1371ef499c47461bd82a70d07c4 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期二, 27 八月 2024 09:18:36 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java index d0fb44d..c1c52ec 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java @@ -737,8 +737,8 @@ jsonObject.append("currentCutTerritory", currentCutTerritorys); //log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys); //纾ㄨ竟淇℃伅 - List<EdgGlassTaskInfo> edgTasks = edgGlassTaskInfoService.selectEdgInfo(); - jsonObject.append("edgTasks", edgTasks); +// List<EdgGlassTaskInfo> edgTasks = edgGlassTaskInfoService.selectEdgInfo(); +// jsonObject.append("edgTasks", edgTasks); //鍗у缂撳瓨绗煎唴淇℃伅 List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages(); -- Gitblit v1.8.0