Merge remote-tracking branch 'origin/master'

zhoushihao

2025-04-01 ae504e646e4775837eba99aa2efb30e6c3c818d4

 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