From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
index 2dc0e39..46691ce 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
@@ -3,6 +3,7 @@
 import com.mes.opctask.entity.EdgStorageDeviceTask;
 import com.mes.opctask.mapper.EdgStorageDeviceTaskMapper;
 import com.mes.opctask.service.EdgStorageDeviceTaskService;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
@@ -11,6 +12,7 @@
  * @Date: 2024/10/24 15:36
  * @Description:
  */
+@Service
 public class EdgStorageDeviceTaskServiceImpl implements EdgStorageDeviceTaskService {
 //    @Override
 //    public void updateTaskMessage(Integer slot, Integer taskRunning, String glassIdOut) {
@@ -21,8 +23,7 @@
 
     @Override
     public EdgStorageDeviceTask queryTaskMessage(String tableName) {
-        edgStorageDeviceTaskMapper.queryTaskMessage(tableName);
-        return null;
+        return edgStorageDeviceTaskMapper.queryTaskMessage(tableName);
     }
 
     @Override

--
Gitblit v1.8.0