Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-23 893fda1fa8bc17002a866381e8940e1c31d11d93

 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>