From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决

---
 basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
index 8e86931..695e989 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
@@ -10,9 +10,7 @@
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Service
 @AllArgsConstructor

--
Gitblit v1.9.3