Merge branch 'dev_dz' into dev

zhuo

2025-03-22 687dfeb52ba6bdc3717e72af373ed60506ac48bf

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -20,14 +20,14 @@
 *
 * @author ruoyi
 */
@Service
@Service("UserDetailsServiceImpl")
public class UserDetailsServiceImpl implements UserDetailsService
{
    private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);

    @Autowired
    private ISysUserService userService;
    

    @Autowired
    private SysPasswordService passwordService;