Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-17 f6ff6a665686b18d3c2be471d49222534f392b61

 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