YiWuProject.git

			@@ -15,8 +15,14 @@
			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} ")
			int checkUser(@Param("userName") String userName,@Param("password") String password);