From 0b30ecf9d6581b4e7a6f7b397ced716acaeaefc0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:15:37 +0800
Subject: [PATCH] 更新冲突
---
TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
index 53e9856..dc3b242 100644
--- a/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ b/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
@@ -16,9 +16,8 @@
User findOne(Integer id);
- @Select("select user_name FROM `user` where login_name=#{LoginName} 聽")
+ @Select("select user_name FROM `user` where login_name=#{LoginName}")
User findOneLoginName(String LoginName);
-
@Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password} ")
int checkUser(@Param("userName") String userName,@Param("password") String password);
--
Gitblit v1.8.0