From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
index 02b7e03..6e13649 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -67,7 +67,7 @@
     
     @Autowired
     private ITUserRedPacketRecordService redPacketRecordService;
-    @Resource
+    @Autowired
     private ShiroExtUtil shiroExtUtil;
     
     /**

--
Gitblit v1.7.1