Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

zhangyong

2024-11-26 31a6849672a6ccac2289fc3bd8fbacdd13c99634

 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