From fb9a4fdf9ba08eaf300803dff945e0e431b717c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 十月 2025 10:35:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/aerjiliya' into aerjiliya

---
 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
index e47e35e..f6447db 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
@@ -70,7 +70,7 @@
 
     @Resource
     BCryptPasswordEncoder passwordEncoder;
-    @Autowired
+    @Resource
     private SysUserRoleMapper sysUserRoleMapper;
 
     @Override

--
Gitblit v1.8.0