From c7d9ef156e031165f6b0f2d949a6500db9f03bd1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 21 五月 2026 18:47:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro

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

diff --git a/src/main/java/com/ruoyi/lavorissue/service/LavorIssueService.java b/src/main/java/com/ruoyi/lavorissue/service/LavorIssueService.java
index a0fd247..d31a48e 100644
--- a/src/main/java/com/ruoyi/lavorissue/service/LavorIssueService.java
+++ b/src/main/java/com/ruoyi/lavorissue/service/LavorIssueService.java
@@ -6,7 +6,7 @@
 import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
 import com.ruoyi.lavorissue.pojo.LaborIssue;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Map;

--
Gitblit v1.9.3