From 4185a44f983c7aa3cf45ec03a65eece9e847e229 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 16 五月 2024 13:22:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
index e994f15..429edc1 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
@@ -1,11 +1,10 @@
 package com.mes.taskcache.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
 import com.mes.taskcache.entity.TaskCache;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,7 +28,7 @@
      * @param line
      * @return
      */
-    List<TaskCache> selectEdgInfo(String line);
+    List<Map<String,Object>> selectEdgInfo(String line);
 
     /**
      * 鏌ヨ鐞嗙墖浠诲姟
@@ -60,7 +59,7 @@
      * @param line
      * @return
      */
-    List<TaskCache> selectLastOutCacheInfos(String line);
+    List<TaskCache> selectLastOutCacheInfos(int line);
 
     /**
      * 鏌ヨ  A09  鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟

--
Gitblit v1.8.0