Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro

yuan

2026-05-21 c7d9ef156e031165f6b0f2d949a6500db9f03bd1

 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>