From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

---
 src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
index 9d95094..2caff09 100644
--- a/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
@@ -1,13 +1,11 @@
 package com.zy.asrs.service.impl;
 
-import com.zy.asrs.mapper.DeviceErrorMapper;
-import com.zy.asrs.entity.DeviceError;
-import com.zy.asrs.service.DeviceErrorService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.core.enums.SlaveType;
+import com.zy.asrs.entity.DeviceError;
+import com.zy.asrs.mapper.DeviceErrorMapper;
+import com.zy.asrs.service.DeviceErrorService;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 
 @Service("deviceErrorService")

--
Gitblit v1.9.1