diff --git a/dsBase/WebRoot/login.html b/dsBase/WebRoot/login.html
index c2eb6d0b..d7a67dfa 100644
--- a/dsBase/WebRoot/login.html
+++ b/dsBase/WebRoot/login.html
@@ -115,10 +115,13 @@
                         "captcha": captcha
                     },
                     async: false,
-                    success: function (result) {
-                        if (result.success) {
+                    success: function (res) {                        
+                        if (res.success) {
                             window.location.href = '/dsWeb/index.html';
+                        }else{
+                            alert(res.msg);
                         }
+                        
                     }
                 });
             }
diff --git a/nginx/logs/nginx.pid b/nginx/logs/nginx.pid
index eb5585f0..4e18b2f4 100644
--- a/nginx/logs/nginx.pid
+++ b/nginx/logs/nginx.pid
@@ -1,5 +1 @@
-<<<<<<< HEAD
-30772
-=======
-32728
->>>>>>> 34d4ee5cc4e42d310e2f63abecc3a24461cfdcec
+31916