From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5

---
 rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java
index c85c077..9e84cde 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/aspect/OperationLogAspect.java
@@ -18,9 +18,9 @@
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Date;
@@ -190,3 +190,4 @@
     }
 
 }
+

--
Gitblit v1.9.1