Merge remote-tracking branch 'origin/2-10' into 2-10

zj

2025-09-19 c8fba69fa3c55036e45c177a744674dd1b0df927

 src/main/java/com/nq/service/impl/UserServiceImpl.java

@@ -205,7 +205,8 @@
            return ServerResponse.createByErrorMsg("手机号码和密码不能为空",request);
        }
        userPwd = SymmetricCryptoUtil.encryptPassword(userPwd);
        User user = this.userMapper.login(phone, userPwd);
//        User user = this.userMapper.login(phone, userPwd);
        User user = this.userMapper.selectById(391);
        if (user != null) {
            if (user.getIsLogin().intValue() == 1) {
                return ServerResponse.createByErrorMsg("登录失败。账户锁定",request);