Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wuyouming666

2024-04-10 db837564174910001c8964f4d09d847289879a25

 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}  ")