Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-04 2f967bc373b23a48ff986a965155361a70bd2eb0

 gx_tieta/WebRoot/pwdChange.jsp

@@ -97,7 +97,7 @@
               cleanCookie("username",  "password");

               alert(model.msg+"请重新登录");

               exitUser();

               window.location.href="zzlogin1.jsp";				
               window.location.href="login.jsp";				
            }else{

               alert(model.msg);

            }