From d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 22 五月 2026 11:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

---
 src/main/java/com/ruoyi/staff/controller/AnalyticsController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
index cfa802c..2522550 100644
--- a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @RestController
 @RequestMapping("/staff/analytics")

--
Gitblit v1.9.3