From ecfcfe8ac671cd2f46dc8d9b9129e1851957b7c0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 09:22:07 +0800
Subject: [PATCH] merge: 合并origin/dev_New_pro从bd86068d之后的所有提交

---
 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