From 62882b6d2366b454fa3c6f33a6b8abb261080405 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期四, 31 十月 2024 11:22:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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 a5a966a..9911a6f 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 @@ -36,7 +36,7 @@ @PostMapping("/temperingTerritory") @ResponseBody public Result temperingTerritory(String current) { - List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectTemperingTerritory(current); + List<Map<String, Object>> h = edgStorageCageDetailsService.selectTemperingTerritory(current); return Result.build(200, "鎴愬姛", h); } -- Gitblit v1.8.0