From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/safe/service/SafeTrainingDetailsService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/service/SafeTrainingDetailsService.java b/src/main/java/com/ruoyi/safe/service/SafeTrainingDetailsService.java
index 8a06f05..4f20efc 100644
--- a/src/main/java/com/ruoyi/safe/service/SafeTrainingDetailsService.java
+++ b/src/main/java/com/ruoyi/safe/service/SafeTrainingDetailsService.java
@@ -6,7 +6,7 @@
 import com.ruoyi.safe.pojo.SafeTrainingDetails;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * <p>

--
Gitblit v1.9.3