From 804c6c4b0d673827d06d97a419c100f33afcdd21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 21 Feb 2020 21:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/modules/sys/sysLogin.js                       | 2 +-
 src/main/java/com/jsh/erp/controller/UserController.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/erp_web/js/modules/sys/sysLogin.js b/erp_web/js/modules/sys/sysLogin.js
index a42c5d2f..74fb044d 100644
--- a/erp_web/js/modules/sys/sysLogin.js
+++ b/erp_web/js/modules/sys/sysLogin.js
@@ -77,7 +77,7 @@ function loginFun() {
             url: "/user/login",
             dataType: "json",
             data: ({
-                loginame: username,
+                loginName: username,
                 password:  hex_md5(password)
             }),
             success: function (res) {
diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index c01b6ec1..67383b16 100644
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -59,7 +59,7 @@ public class UserController {
     private static final String CODE_OK = "200";
 
     @PostMapping(value = "/login")
-    public BaseResponseInfo login(@RequestParam(value = "loginame", required = false) String loginame,
+    public BaseResponseInfo login(@RequestParam(value = "loginName", required = false) String loginName,
                         @RequestParam(value = "password", required = false) String password,
                         HttpServletRequest request)throws Exception {
         logger.info("============用户登录 login 方法调用开始==============");
@@ -67,7 +67,7 @@ public class UserController {
         User user=null;
         BaseResponseInfo res = new BaseResponseInfo();
         try {
-            String username = loginame.trim();
+            String username = loginName.trim();
             password = password.trim();
             //判断用户是否已经登录过，登录过不再处理
             Object userInfo = request.getSession().getAttribute("user");