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/test/java/com/mes/CacheGlassModuleApplicationTest.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java index 93f0fda..61259b4 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java @@ -49,7 +49,7 @@ @Autowired TaskCacheServiceImpl taskCacheServiceImpl; - @Autowired + @Resource OptimizeDetailMapper optimizeDetailMapper; @Autowired GlassInfoService glassInfoService; @@ -144,7 +144,7 @@ @Test public void testEngineerTerritory() { - List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203"); + List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203"); log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map)); } -- Gitblit v1.8.0