From ea073afc6b4bc758990ac60f5e33254d1143272c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 26 三月 2024 13:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 6f40252..2a4debe 100644
--- a/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ b/CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
@@ -15,9 +15,12 @@
List<User> findAll();
User findOne(Integer id);
-
- @Select("select user_name FROM `user` where login_name=#{LoginName} ")
+<<<<<<< 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