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/api/controller/pda/SysInfoController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
index 3cf92ea..062c3a0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
@@ -17,7 +17,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -67,3 +67,4 @@
     }
 
 }
+

--
Gitblit v1.9.1