From c8fba69fa3c55036e45c177a744674dd1b0df927 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 19 Sep 2025 22:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10

---
 src/main/java/com/nq/service/impl/UserServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 922b26a..3207e83 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/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);

--
Gitblit v1.9.3