Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -35,7 +35,7 @@ class LoginLogic extends BaseLogic
             $this->fail('帐号已被禁用');
         }
         if (!Hash::check($this->requestAll['password'], $manage->password)) {
-            var_dump($this->requestAll['password']);
+            var_dump($manage->password);
             die();
             $this->fail('登录密码不正确');
         }