From 7b89e2cf25b6d5a43ecc86bb64a6a245ae862c6e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 17 五月 2024 11:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index bef6b24..e4bbd40 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -61,7 +61,7 @@
@PostMapping("/selectEdgTask")
@ResponseBody
public Result selectEdgTask(String line) {
- List<TaskCache> EdgTasks = taskCacheService.selectEdgInfo(line);
+ List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo(line);
return Result.build(200,"鎴愬姛",EdgTasks);
}
--
Gitblit v1.8.0