Merge remote-tracking branch 'origin/aerjiliya' into aerjiliya

ZengTao

2025-10-13 fb9a4fdf9ba08eaf300803dff945e0e431b717c4

 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