From b692ac435d17332e262b23ad231577bfb5238f83 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 26 三月 2024 14:09:02 +0800
Subject: [PATCH] 后端
---
CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java b/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
index 2a4debe..0453572 100644
--- a/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ b/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
@@ -15,12 +15,9 @@
List<User> findAll();
User findOne(Integer id);
-<<<<<<< HEAD
- @Select("select user_name FROM `user` where login_name=#{LoginName}")
-=======
@Select("select user_name FROM `user` where login_name=#{LoginName} ")
->>>>>>> e9b0059e5ee9551f7b9b81c9358ce3d42886ae9a
+
User findOneLoginName(String LoginName);
@Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password} ")
--
Gitblit v1.8.0