From 893fda1fa8bc17002a866381e8940e1c31d11d93 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 23 五月 2026 13:46:00 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

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

diff --git a/src/main/java/com/ruoyi/safe/service/SafeTrainingService.java b/src/main/java/com/ruoyi/safe/service/SafeTrainingService.java
index 56f2e6e..ab9f3cc 100644
--- a/src/main/java/com/ruoyi/safe/service/SafeTrainingService.java
+++ b/src/main/java/com/ruoyi/safe/service/SafeTrainingService.java
@@ -6,7 +6,7 @@
 import com.ruoyi.safe.pojo.SafeTraining;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

--
Gitblit v1.9.3